Mercurial > hg
changeset 23483:3805f4b0f5a9
largefiles: remove redundant checks for false modify/delete conflicts
In a34a99181f36 (largefiles: don't show largefile/normal prompts if
one side is unchanged, 2014-12-01), overridecalculateupdates() started
checking for false modify/delete conflicts in large files and their
standins. Then, in the very next changeset, 902554884335 (merge:
before cd/dc prompt, check that changed side really changed,
2014-12-01), calculateupdates() itself started checking for false
modify/delete conflicts in all files. Since "large files and their
standins" is a subset of "all files", we can now drop the checks in
overridecalculateupdates().
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 05 Dec 2014 10:53:25 -0800 |
| parents | 208ec8ca7c79 |
| children | cf3495dfd7ed |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 2 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Dec 03 14:03:20 2014 -0800 +++ b/hgext/largefiles/overrides.py Fri Dec 05 10:53:25 2014 -0800 @@ -440,15 +440,7 @@ usermsg = _('remote turned local normal file %s into a largefile\n' 'use (l)argefile or keep (n)ormal file?' '$$ &Largefile $$ &Normal file') % lfile - if (# local has unchanged normal file, pick remote largefile - pas and lfile in pas[0] and - not pas[0][lfile].cmp(p1[lfile]) or - # if remote has unchanged largefile, pick local normal file - not (pas and standin in pas[0] and - not pas[0][standin].cmp(p2[standin])) and - # else, prompt - repo.ui.promptchoice(usermsg, 0) == 0 - ): # pick remote largefile + if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile actions['r'].append((lfile, None, 'replaced by standin')) newglist.append((standin, (p2.flags(standin),), msg)) else: # keep local normal file @@ -461,15 +453,7 @@ usermsg = _('remote turned local largefile %s into a normal file\n' 'keep (l)argefile or use (n)ormal file?' '$$ &Largefile $$ &Normal file') % lfile - if (# if remote has unchanged normal file, pick local largefile - pas and f in pas[0] and - not pas[0][f].cmp(p2[f]) or - # if local has unchanged largefile, pick remote normal file - not (pas and standin in pas[0] and - not pas[0][standin].cmp(p1[standin])) and - # else, prompt - repo.ui.promptchoice(usermsg, 0) == 0 - ): # keep local largefile + if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile if branchmerge: # largefile can be restored from standin safely actions['r'].append((lfile, None, 'replaced by standin'))