equal
deleted
inserted
replaced
3038 raise util.Abort(_("please specify just one revision")) |
3038 raise util.Abort(_("please specify just one revision")) |
3039 |
3039 |
3040 if not rev: |
3040 if not rev: |
3041 rev = node |
3041 rev = node |
3042 |
3042 |
3043 if not clean and check: |
3043 if check and clean: |
|
3044 raise util.Abort(_("cannot specify both -c and -C")) |
|
3045 |
|
3046 if check: |
3044 # we could use dirty() but we can ignore merge and branch trivia |
3047 # we could use dirty() but we can ignore merge and branch trivia |
3045 c = repo[None] |
3048 c = repo[None] |
3046 if c.modified() or c.added() or c.removed(): |
3049 if c.modified() or c.added() or c.removed(): |
3047 raise util.Abort(_("uncommitted local changes")) |
3050 raise util.Abort(_("uncommitted local changes")) |
3048 |
3051 |