Skip to content
Snippets Groups Projects
Commit 2ea6e42e authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

remotenames: consider existing data while storing newer data

Previously reviewed as D1357.

Differential Revision: https://phab.mercurial-scm.org/D1551
parent 744d1c87
No related branches found
No related tags found
No related merge requests found
......@@ -64,6 +64,12 @@
# version '0' represents the very initial version of the storage format
f.write('0\n\n')
olddata = set(readremotenamefile(repo, nametype))
# re-save the data from a different remote than this one.
for node, oldpath, rname in sorted(olddata):
if oldpath != remotepath:
f.write('%s\0%s\0%s\n' % (node, oldpath, rname))
for name, node in sorted(names.iteritems()):
if nametype == "branches":
for n in node:
......
......@@ -102,5 +102,7 @@
$ cat .hg/remotenames/bookmarks
0
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc)
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc)
......@@ -105,5 +107,6 @@
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc)
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc)
$ cat .hg/remotenames/branches
0
......@@ -107,5 +110,7 @@
$ cat .hg/remotenames/branches
0
3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)
ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)
ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server2\x00default (esc)
3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server2\x00wat (esc)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment