Mercurial > hg
comparison mercurial/merge.py @ 23482:208ec8ca7c79
merge: make 'keep' message more descriptive
Most merge action messages don't describe the action itself, they
describe the reason the action was taken. The only exeption is the 'k'
action, for which the message is just "keep" and instead there is a
code comment folling it that says "remote unchanged". Let's move that
comment into the merge action message.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Dec 2014 14:03:20 -0800 |
| parents | 406dfc63a1ad |
| children | a1a7c94def6d |
comparison
equal
deleted
inserted
replaced
| 23481:94091ab9d112 | 23482:208ec8ca7c79 |
|---|---|
| 425 else: | 425 else: |
| 426 a = ma[f] | 426 a = ma[f] |
| 427 fla = ma.flags(f) | 427 fla = ma.flags(f) |
| 428 nol = 'l' not in fl1 + fl2 + fla | 428 nol = 'l' not in fl1 + fl2 + fla |
| 429 if n2 == a and fl2 == fla: | 429 if n2 == a and fl2 == fla: |
| 430 actions['k'].append((f, (), "keep")) # remote unchanged | 430 actions['k'].append((f, (), "remote unchanged")) |
| 431 elif n1 == a and fl1 == fla: # local unchanged - use remote | 431 elif n1 == a and fl1 == fla: # local unchanged - use remote |
| 432 if n1 == n2: # optimization: keep local content | 432 if n1 == n2: # optimization: keep local content |
| 433 actions['e'].append((f, (fl2,), "update permissions")) | 433 actions['e'].append((f, (fl2,), "update permissions")) |
| 434 else: | 434 else: |
| 435 actions['g'].append((f, (fl2,), "remote is newer")) | 435 actions['g'].append((f, (fl2,), "remote is newer")) |