Submitter | phabricator |
---|---|
Date | Dec. 6, 2017, 6:57 p.m. |
Message ID | <differential-rev-PHID-DREV-ub62wjx7ndw7y2xtjerq-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/25979/ |
State | Superseded |
Headers | show |
Comments
durin42 added a comment. Can you also rename the file stored by logexchange so it doesn't conflict with the out-of-tree extension? Thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1607 To: pulkit, #hg-reviewers Cc: durin42, smf, mercurial-devel
krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. This doesn't apply cleanly. Can you rebase? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1607 To: pulkit, #hg-reviewers, krbullock Cc: krbullock, durin42, smf, mercurial-devel
Patch
diff --git a/mercurial/remotenames.py b/mercurial/logexchange.py rename from mercurial/remotenames.py rename to mercurial/logexchange.py diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -23,11 +23,11 @@ discovery, error, lock as lockmod, + logexchange, obsolete, phases, pushkey, pycompat, - remotenames, scmutil, sslutil, streamclone, @@ -1307,7 +1307,7 @@ # storing remotenames if repo.ui.configbool('experimental', 'remotenames'): - remotenames.pullremotenames(repo, remote) + logexchange.pullremotenames(repo, remote) return pullop