Patchwork D2277: remotenames: don't use the default value of logfmt for namespaces

login
register
mail settings
Submitter phabricator
Date Feb. 16, 2018, 12:33 p.m.
Message ID <87fac5c0c516abff8e4cc4da7c283622@localhost.localdomain>
Download mbox | patch
Permalink /patch/27989/
State Not Applicable
Headers show

Comments

phabricator - Feb. 16, 2018, 12:33 p.m.
pulkit updated this revision to Diff 5777.
pulkit edited the summary of this revision.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2277?vs=5756&id=5777

REVISION DETAIL
  https://phab.mercurial-scm.org/D2277

AFFECTED FILES
  hgext/remotenames.py
  tests/test-logexchange.t

CHANGE DETAILS




To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
Sean Farley - Feb. 20, 2018, 11:37 p.m.
pulkit (Pulkit Goyal) <phabricator@mercurial-scm.org> writes:

> pulkit updated this revision to Diff 5777.
> pulkit edited the summary of this revision.
>
> REPOSITORY
>   rHG Mercurial
>
> CHANGES SINCE LAST UPDATE
>   https://phab.mercurial-scm.org/D2277?vs=5756&id=5777
>
> REVISION DETAIL
>   https://phab.mercurial-scm.org/D2277
>
> AFFECTED FILES
>   hgext/remotenames.py
>   tests/test-logexchange.t
>
> CHANGE DETAILS
>
> diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t
> --- a/tests/test-logexchange.t
> +++ b/tests/test-logexchange.t
> @@ -127,24 +127,24 @@
>    @  changeset:   8:3e1487808078
>    |  branch:      wat
>    |  tag:         tip
> -  |  remote branch:$TESTTMP/server2/wat
> -  |  remote branch:default/wat
> +  |  remote branch:  $TESTTMP/server2/wat
> +  |  remote branch:  default/wat

For archaeological purposes:

This is precisely the reason why I didn't label this as 'remote foo'
because moving the ':' set off my ocd tendencies.

Patch

diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t
--- a/tests/test-logexchange.t
+++ b/tests/test-logexchange.t
@@ -127,24 +127,24 @@ 
   @  changeset:   8:3e1487808078
   |  branch:      wat
   |  tag:         tip
-  |  remote branch:$TESTTMP/server2/wat
-  |  remote branch:default/wat
+  |  remote branch:  $TESTTMP/server2/wat
+  |  remote branch:  default/wat
   |  parent:      4:aa98ab95a928
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     added bar
   |
   | o  changeset:   7:ec2426147f0e
-  | |  remote branch:$TESTTMP/server2/default
-  | |  remote branch:default/default
+  | |  remote branch:  $TESTTMP/server2/default
+  | |  remote branch:  default/default
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Added h
   | |
   | o  changeset:   6:87d6d6676308
   | |  bookmark:    bar
-  | |  remote bookmark:$TESTTMP/server2/bar
-  | |  remote bookmark:default/bar
+  | |  remote bookmark:  $TESTTMP/server2/bar
+  | |  remote bookmark:  default/bar
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Added g
@@ -161,8 +161,8 @@ 
   |
   o  changeset:   3:62615734edd5
   |  bookmark:    foo
-  |  remote bookmark:$TESTTMP/server2/foo
-  |  remote bookmark:default/foo
+  |  remote bookmark:  $TESTTMP/server2/foo
+  |  remote bookmark:  default/foo
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Added d
diff --git a/hgext/remotenames.py b/hgext/remotenames.py
--- a/hgext/remotenames.py
+++ b/hgext/remotenames.py
@@ -192,8 +192,8 @@ 
         remotebookmarkns = ns(
             'remotebookmarks',
             templatename='remotebookmarks',
-            logname='remote bookmark',
             colorname='remotebookmark',
+            logfmt='remote bookmark:  %s\n',
             listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
             namemap=lambda repo, name:
                 repo._remotenames.bmarktonodes().get(name, []),
@@ -205,8 +205,8 @@ 
         remotebranchns = ns(
             'remotebranches',
             templatename='remotebranches',
-            logname='remote branch',
             colorname='remotebranch',
+            logfmt='remote branch:  %s\n',
             listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
             namemap = lambda repo, name:
                 repo._remotenames.branchtonodes().get(name, []),