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