Mercurial > hg > churn
changeset 2984:87a0332ab58b
merge: combine merge and get lists
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 22 Aug 2006 18:06:17 -0500 |
| parents | c67920d78248 |
| children | 962b9c7df641 |
| files | mercurial/merge.py tests/test-up-local-change.out |
| diffstat | 2 files changed, 47 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Aug 22 17:42:55 2006 -0500 +++ b/mercurial/merge.py Tue Aug 22 18:06:17 2006 -0500 @@ -110,8 +110,7 @@ repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (short(man), short(m1n), short(m2n))) - merge = {} - get = {} + action = {} remove = [] forget = [] @@ -150,19 +149,19 @@ # are both different from the ancestor? if not overwrite and n != a and m2[f] != a: repo.ui.debug(_(" %s versions differ, resolve\n") % f) - merge[f] = (fmerge(f, m1, m2, ma), n[:20], m2[f]) + action[f] = (fmerge(f, m1, m2, ma), n[:20], m2[f]) queued = 1 # are we clobbering? # is remote's version newer? # or are we going back in time and clean? elif overwrite or m2[f] != a or (backwards and not n[20:]): repo.ui.debug(_(" remote %s is newer, get\n") % f) - get[f] = (m2.execf(f), m2[f]) + action[f] = (m2.execf(f), m2[f], None) queued = 1 elif f in umap or f in added: # this unknown file is the same as the checkout # we need to reset the dirstate if the file was added - get[f] = (m2.execf(f), m2[f]) + action[f] = (m2.execf(f), m2[f], None) # do we still need to look at mode bits? if not queued and m1.execf(f) != m2.execf(f): @@ -211,14 +210,14 @@ (_("remote changed %s which local deleted\n") % f) + _("(k)eep or (d)elete?"), _("[kd]"), _("k")) if r == _("k"): - get[f] = (m2.execf(f), n) + action[f] = (m2.execf(f), n, None) elif f not in ma: repo.ui.debug(_("remote created %s\n") % f) - get[f] = (m2.execf(f), n) + action[f] = (m2.execf(f), n, None) else: if overwrite or backwards: repo.ui.debug(_("local deleted %s, recreating\n") % f) - get[f] = (m2.execf(f), n) + action[f] = (m2.execf(f), n, None) else: repo.ui.debug(_("local deleted %s\n") % f) @@ -237,28 +236,26 @@ repo.hook('preupdate', throw=True, parent1=xp1, parent2=xxp2) - # get the files we don't need to change - files = get.keys() + # update files + unresolved = [] + updated = 0 + merged = 0 + files = action.keys() files.sort() for f in files: - flag, node = get[f] + flag, my, other = action[f] if f[0] == "/": continue - repo.ui.note(_("getting %s\n") % f) - t = repo.file(f).read(node) - repo.wwrite(f, t) - util.set_exec(repo.wjoin(f), flag) - - # merge the tricky bits - unresolved = [] - files = merge.keys() - files.sort() - for f in files: - repo.ui.status(_("merging %s\n") % f) - flag, my, other = merge[f] - ret = merge3(repo, f, my, other, xp1, xp2) - if ret: - unresolved.append(f) + if other: + repo.ui.status(_("merging %s\n") % f) + if merge3(repo, f, my, other, xp1, xp2): + unresolved.append(f) + merged += 1 + else: + repo.ui.note(_("getting %s\n") % f) + t = repo.file(f).read(my) + repo.wwrite(f, t) + updated += 1 util.set_exec(repo.wjoin(f), flag) remove.sort() @@ -281,34 +278,33 @@ else: repo.dirstate.forget(remove) - files = get.keys() - files.sort() - for f in files: - if branchmerge: - repo.dirstate.update([f], 'n', st_mtime=-1) - else: - repo.dirstate.update([f], 'n') - - files = merge.keys() + files = action.keys() files.sort() for f in files: - if branchmerge: - # We've done a branch merge, mark this file as merged - # so that we properly record the merger later - repo.dirstate.update([f], 'm') + flag, my, other = action[f] + if not other: + if branchmerge: + repo.dirstate.update([f], 'n', st_mtime=-1) + else: + repo.dirstate.update([f], 'n') else: - # We've update-merged a locally modified file, so - # we set the dirstate to emulate a normal checkout - # of that file some time in the past. Thus our - # merge will appear as a normal local file - # modification. - fl = repo.file(f) - f_len = fl.size(fl.rev(other)) - repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1) + if branchmerge: + # We've done a branch merge, mark this file as merged + # so that we properly record the merger later + repo.dirstate.update([f], 'm') + else: + # We've update-merged a locally modified file, so + # we set the dirstate to emulate a normal checkout + # of that file some time in the past. Thus our + # merge will appear as a normal local file + # modification. + fl = repo.file(f) + f_len = fl.size(fl.rev(other)) + repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1) if show_stats: - stats = ((len(get), _("updated")), - (len(merge) - len(unresolved), _("merged")), + stats = ((updated, _("updated")), + (merged - len(unresolved), _("merged")), (len(remove), _("removed")), (len(unresolved), _("unresolved"))) note = ", ".join([_("%d files %s") % s for s in stats])
--- a/tests/test-up-local-change.out Tue Aug 22 17:42:55 2006 -0500 +++ b/tests/test-up-local-change.out Tue Aug 22 18:06:17 2006 -0500 @@ -19,10 +19,10 @@ ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b -getting b merging a resolving a file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 +getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 tag: tip @@ -53,10 +53,10 @@ ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b -getting b merging a resolving a file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 +getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 tag: tip