| author | Matt Harbison <matt_harbison@yahoo.com> |
| Wed, 11 Apr 2018 18:23:29 -0400 | |
| changeset 37565 | 9c7a25ef5b49 |
| parent 37090 | a61fff493d98 |
| child 37982 | 7465b908d305 |
| permissions | -rw-r--r-- |
|
35236
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Testing the functionality to pull remotenames |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
============================================= |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
$ cat >> $HGRCPATH << EOF |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
> [alias] |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
> glog = log -G -T '{rev}:{node|short} {desc}'
|
|
35331
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
7 |
> [experimental] |
|
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
8 |
> remotenames = True |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
9 |
> [extensions] |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
10 |
> remotenames = |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
11 |
> show = |
|
35236
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> EOF |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
Making a server repo |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
-------------------- |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ hg init server |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ cd server |
|
35256
8fbb2678d8e8
tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents:
35240
diff
changeset
|
19 |
$ for ch in a b c d e f g h; do |
|
8fbb2678d8e8
tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents:
35240
diff
changeset
|
20 |
> echo "foo" >> $ch |
|
8fbb2678d8e8
tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents:
35240
diff
changeset
|
21 |
> hg ci -Aqm "Added "$ch |
|
8fbb2678d8e8
tests: remove {a..h} bashism from remotenames
Augie Fackler <augie@google.com>
parents:
35240
diff
changeset
|
22 |
> done |
|
35236
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
$ hg glog |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
@ 7:ec2426147f0e Added h |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
o 6:87d6d6676308 Added g |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
o 5:825660c69f0c Added f |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
o 4:aa98ab95a928 Added e |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
o 3:62615734edd5 Added d |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
o 2:28ad74487de9 Added c |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
o 1:29becc82797a Added b |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
| |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
o 0:18d04c59bb5d Added a |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
$ hg bookmark -r 3 foo |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
$ hg bookmark -r 6 bar |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
$ hg up 4 |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
$ hg branch wat |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
marked working directory as branch wat |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
(branches are permanent and global, did you want a bookmark?) |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
$ echo foo >> bar |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
$ hg ci -Aqm "added bar" |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
Making a client repo |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
-------------------- |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
|
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
$ cd .. |
|
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
|
|
35331
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
55 |
$ hg clone server client |
|
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
56 |
updating to branch default |
|
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
57 |
8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35237
8df8ce2cc5dd
remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35236
diff
changeset
|
58 |
|
|
35331
773a9a06047c
clone: add support for storing remotenames while cloning
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35256
diff
changeset
|
59 |
$ cd client |
|
35347
a29fe459fc49
remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35331
diff
changeset
|
60 |
$ cat .hg/logexchange/bookmarks |
|
35237
8df8ce2cc5dd
remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35236
diff
changeset
|
61 |
0 |
|
35236
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
|
|
36059
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
63 |
87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
64 |
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
35237
8df8ce2cc5dd
remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35236
diff
changeset
|
65 |
|
|
35347
a29fe459fc49
remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35331
diff
changeset
|
66 |
$ cat .hg/logexchange/branches |
|
35237
8df8ce2cc5dd
remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35236
diff
changeset
|
67 |
0 |
|
35236
5a62910948d2
remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
|
|
36059
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
69 |
ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
70 |
3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
35238
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
71 |
|
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
72 |
$ hg show work |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
73 |
o 3e14 (wat) (default/wat) added bar |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
74 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
75 |
~ |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
76 |
@ ec24 (default/default) Added h |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
77 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
78 |
~ |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
79 |
|
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
80 |
$ hg update "default/wat" |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
81 |
1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
82 |
$ hg identify |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
83 |
3e1487808078 (wat) tip |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
84 |
|
|
35238
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
85 |
Making a new server |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
86 |
------------------- |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
87 |
|
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
88 |
$ cd .. |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
89 |
$ hg init server2 |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
90 |
$ cd server2 |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
91 |
$ hg pull ../server/ |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
92 |
pulling from ../server/ |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
93 |
requesting all changes |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
94 |
adding changesets |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
95 |
adding manifests |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
96 |
adding file changes |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
97 |
added 9 changesets with 9 changes to 9 files (+1 heads) |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
98 |
adding remote bookmark bar |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
99 |
adding remote bookmark foo |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
100 |
new changesets 18d04c59bb5d:3e1487808078 |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
101 |
(run 'hg heads' to see heads) |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
102 |
|
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
103 |
Pulling form the new server |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
104 |
--------------------------- |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
105 |
$ cd ../client/ |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
106 |
$ hg pull ../server2/ |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
107 |
pulling from ../server2/ |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
108 |
searching for changes |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
109 |
no changes found |
|
35347
a29fe459fc49
remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35331
diff
changeset
|
110 |
$ cat .hg/logexchange/bookmarks |
|
35238
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
111 |
0 |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
112 |
|
|
36059
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
113 |
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
114 |
87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
115 |
87d6d66763085b629e6d7ed56778c79827273022\x00$TESTTMP/server2\x00bar (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
116 |
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00$TESTTMP/server2\x00foo (esc) |
|
35240
2ea6e42ed15e
remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35238
diff
changeset
|
117 |
|
|
35347
a29fe459fc49
remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35331
diff
changeset
|
118 |
$ cat .hg/logexchange/branches |
|
35238
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
119 |
0 |
|
54bb94b715ad
remotenames: add test showing overwriting on remotenames data
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35237
diff
changeset
|
120 |
|
|
36059
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
121 |
3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
122 |
ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
123 |
ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc) |
|
62a428bf6359
logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35347
diff
changeset
|
124 |
3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc) |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
125 |
|
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
126 |
$ hg log -G |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
127 |
@ changeset: 8:3e1487808078 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
128 |
| branch: wat |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
129 |
| tag: tip |
|
36264
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
130 |
| remote branch: $TESTTMP/server2/wat |
|
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
131 |
| remote branch: default/wat |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
132 |
| parent: 4:aa98ab95a928 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
133 |
| user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
134 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
135 |
| summary: added bar |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
136 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
137 |
| o changeset: 7:ec2426147f0e |
|
36264
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
138 |
| | remote branch: $TESTTMP/server2/default |
|
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
139 |
| | remote branch: default/default |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
140 |
| | user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
141 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
142 |
| | summary: Added h |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
143 |
| | |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
144 |
| o changeset: 6:87d6d6676308 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
145 |
| | bookmark: bar |
|
36264
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
146 |
| | remote bookmark: $TESTTMP/server2/bar |
|
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
147 |
| | remote bookmark: default/bar |
|
37089
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
148 |
| | hoisted name: bar |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
149 |
| | user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
150 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
151 |
| | summary: Added g |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
152 |
| | |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
153 |
| o changeset: 5:825660c69f0c |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
154 |
|/ user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
155 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
156 |
| summary: Added f |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
157 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
158 |
o changeset: 4:aa98ab95a928 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
159 |
| user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
160 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
161 |
| summary: Added e |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
162 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
163 |
o changeset: 3:62615734edd5 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
164 |
| bookmark: foo |
|
36264
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
165 |
| remote bookmark: $TESTTMP/server2/foo |
|
18e29c65bc5c
remotenames: don't use the default value of logfmt for namespaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36149
diff
changeset
|
166 |
| remote bookmark: default/foo |
|
37089
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
167 |
| hoisted name: foo |
|
36062
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
168 |
| user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
169 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
170 |
| summary: Added d |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
171 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
172 |
o changeset: 2:28ad74487de9 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
173 |
| user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
174 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
175 |
| summary: Added c |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
176 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
177 |
o changeset: 1:29becc82797a |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
178 |
| user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
179 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
180 |
| summary: Added b |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
181 |
| |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
182 |
o changeset: 0:18d04c59bb5d |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
183 |
user: test |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
184 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
185 |
summary: Added a |
|
382aefea8faf
remotenames: add new namespaces for remotebookmarks and remotebranches
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36059
diff
changeset
|
186 |
|
|
36063
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
187 |
Testing the templates provided by remotenames extension |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
188 |
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
189 |
`remotenames` keyword |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
190 |
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
191 |
$ hg log -G -T "{rev}:{node|short} {remotenames}\n"
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
192 |
@ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
193 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
194 |
| o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
195 |
| | |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
196 |
| o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
197 |
| | |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
198 |
| o 5:825660c69f0c |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
199 |
|/ |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
200 |
o 4:aa98ab95a928 |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
201 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
202 |
o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
203 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
204 |
o 2:28ad74487de9 |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
205 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
206 |
o 1:29becc82797a |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
207 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
208 |
o 0:18d04c59bb5d |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
209 |
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
210 |
`remotebookmarks` and `remotebranches` keywords |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
211 |
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
212 |
$ hg log -G -T "{rev}:{node|short} [{remotebookmarks}] ({remotebranches})"
|
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
213 |
@ 8:3e1487808078 [] ($TESTTMP/server2/wat default/wat) |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
214 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
215 |
| o 7:ec2426147f0e [] ($TESTTMP/server2/default default/default) |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
216 |
| | |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
217 |
| o 6:87d6d6676308 [$TESTTMP/server2/bar default/bar] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
218 |
| | |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
219 |
| o 5:825660c69f0c [] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
220 |
|/ |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
221 |
o 4:aa98ab95a928 [] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
222 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
223 |
o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
224 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
225 |
o 2:28ad74487de9 [] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
226 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
227 |
o 1:29becc82797a [] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
228 |
| |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
229 |
o 0:18d04c59bb5d [] () |
|
5a53af7d09aa
remotenames: introduce new template keywords for remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36062
diff
changeset
|
230 |
|
|
37089
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
231 |
The `hoistednames` template keyword |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
232 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
233 |
$ hg log -GT "{rev}:{node|short} ({hoistednames})"
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
234 |
@ 8:3e1487808078 () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
235 |
| |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
236 |
| o 7:ec2426147f0e () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
237 |
| | |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
238 |
| o 6:87d6d6676308 (bar) |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
239 |
| | |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
240 |
| o 5:825660c69f0c () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
241 |
|/ |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
242 |
o 4:aa98ab95a928 () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
243 |
| |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
244 |
o 3:62615734edd5 (foo) |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
245 |
| |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
246 |
o 2:28ad74487de9 () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
247 |
| |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
248 |
o 1:29becc82797a () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
249 |
| |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
250 |
o 0:18d04c59bb5d () |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
251 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
252 |
|
|
36149
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
253 |
Testing the revsets provided by remotenames extension |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
254 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
255 |
`remotenames` revset |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
256 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
257 |
$ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n"
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
258 |
@ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
259 |
: |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
260 |
: o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
261 |
: | |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
262 |
: o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
263 |
:/ |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
264 |
o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
265 |
| |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
266 |
~ |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
267 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
268 |
`remotebranches` revset |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
269 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
270 |
$ hg log -r "remotebranches()" -GT "{rev}:{node|short} {remotenames}\n"
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
271 |
@ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
272 |
| |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
273 |
~ |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
274 |
o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
275 |
| |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
276 |
~ |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
277 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
278 |
`remotebookmarks` revset |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
279 |
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
280 |
$ hg log -r "remotebookmarks()" -GT "{rev}:{node|short} {remotenames}\n"
|
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
281 |
o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
282 |
: |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
283 |
o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
284 |
| |
|
828f44cdfee3
remotenames: add three new revsets related to remotenames
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36063
diff
changeset
|
285 |
~ |
|
37089
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
286 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
287 |
Updating to revision using hoisted name |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
288 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
289 |
Deleting local bookmark to make sure we update to hoisted name only |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
290 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
291 |
$ hg bookmark -d bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
292 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
293 |
$ hg up bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
294 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
295 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
296 |
$ hg log -r . |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
297 |
changeset: 6:87d6d6676308 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
298 |
remote bookmark: $TESTTMP/server2/bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
299 |
remote bookmark: default/bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
300 |
hoisted name: bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
301 |
user: test |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
302 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
303 |
summary: Added g |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
304 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
305 |
When both local bookmark and hoisted name exists but on different revs |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
306 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
307 |
$ hg up 8 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
308 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
309 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
310 |
$ hg bookmark foo |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
311 |
moving bookmark 'foo' forward from 62615734edd5 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
312 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
313 |
Local bookmark should take precedence over hoisted name |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
314 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
315 |
$ hg up foo |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
316 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
317 |
|
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
318 |
$ hg log -r . |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
319 |
changeset: 8:3e1487808078 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
320 |
branch: wat |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
321 |
bookmark: foo |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
322 |
tag: tip |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
323 |
remote branch: $TESTTMP/server2/wat |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
324 |
remote branch: default/wat |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
325 |
parent: 4:aa98ab95a928 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
326 |
user: test |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
327 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
328 |
summary: added bar |
|
9938992c5bae
remotenames: add functionality to hoist remotebookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36264
diff
changeset
|
329 |
|
|
37090
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
330 |
$ hg bookmarks |
|
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
331 |
$TESTTMP/server2/bar 6:87d6d6676308 |
|
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
332 |
$TESTTMP/server2/foo 3:62615734edd5 |
|
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
333 |
default/bar 6:87d6d6676308 |
|
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
334 |
default/foo 3:62615734edd5 |
|
a61fff493d98
remotenames: show remote bookmarks in `hg bookmarks`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37089
diff
changeset
|
335 |
* foo 8:3e1487808078 |