Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-xdg.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 10 Aug 2020 15:47:21 +0530
changeset 45385 05d19ca33b33
parent 32429 7d8da7b54dc0
child 51607 a4b3b8dee0a8
permissions -rw-r--r--
mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Storing that a file is resolved for the other parent while merging is just one case of things we will like to store in the mergestate. There are more which we will like to store. This patch replaces `addmergedother()` with a much more generic `addcommitinfo()`. Doing this, we also blinding stores the same key value pair generated by the merge code instead of touching them. Differential Revision: https://phab.mercurial-scm.org/D8923
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
30941
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset 
     1
 
#if no-windows no-osx
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset 
     2
 












354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     3


  $ mkdir -p xdgconf/hg













354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     4


  $ echo '[ui]' > xdgconf/hg/hgrc













354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     5


  $ echo 'username = foobar' >> xdgconf/hg/hgrc













354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     6


  $ XDG_CONFIG_HOME="`pwd`/xdgconf" ; export XDG_CONFIG_HOME













354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     7


  $ unset HGRCPATH








32429






7d8da7b54dc0
tests: hide warning from test-xdg.t



Durham Goode <durham@fb.com>


parents: 
30941

diff
changeset




     8


  $ hg config ui.username 2>/dev/null








30941






354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




     9


  foobar













354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




    10














354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc



David Demelier <demelier.david@gmail.com>


parents: 

diff
changeset




    11


#endif















Mercurial