##// END OF EJS Templates
commit: return 1 for interactive commit with no changes (issue5397)...
Philippe Pepiot -
r30157:df224038 default
parent child Browse files
Show More
@@ -1638,9 +1638,11 b' def commit(ui, repo, *pats, **opts):'
1638 def _docommit(ui, repo, *pats, **opts):
1638 def _docommit(ui, repo, *pats, **opts):
1639 if opts.get('interactive'):
1639 if opts.get('interactive'):
1640 opts.pop('interactive')
1640 opts.pop('interactive')
1641 cmdutil.dorecord(ui, repo, commit, None, False,
1641 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1642 cmdutil.recordfilter, *pats, **opts)
1642 cmdutil.recordfilter, *pats, **opts)
1643 return
1643 # ret can be 0 (no changes to record) or the value returned by
1644 # commit(), 1 if nothing changed or None on success.
1645 return 1 if ret == 0 else ret
1644
1646
1645 if opts.get('subrepos'):
1647 if opts.get('subrepos'):
1646 if opts.get('amend'):
1648 if opts.get('amend'):
@@ -37,6 +37,7 b' Committing some changes but stopping on '
37 > EOF
37 > EOF
38 $ hg commit -i -m "a" -d "0 0"
38 $ hg commit -i -m "a" -d "0 0"
39 no changes to record
39 no changes to record
40 [1]
40 $ hg tip
41 $ hg tip
41 changeset: -1:000000000000
42 changeset: -1:000000000000
42 tag: tip
43 tag: tip
@@ -60,6 +61,7 b' Committing some changes'
60 Check that commit -i works with no changes
61 Check that commit -i works with no changes
61 $ hg commit -i
62 $ hg commit -i
62 no changes to record
63 no changes to record
64 [1]
63
65
64 Committing only one file
66 Committing only one file
65
67
@@ -29,6 +29,7 b' Select no files'
29 examine changes to 'empty-rw'? [Ynesfdaq?] n
29 examine changes to 'empty-rw'? [Ynesfdaq?] n
30
30
31 no changes to record
31 no changes to record
32 [1]
32
33
33 $ hg tip -p
34 $ hg tip -p
34 changeset: -1:000000000000
35 changeset: -1:000000000000
@@ -1376,6 +1377,7 b' Removing changes from patch'
1376 record this change to 'editedfile'? [Ynesfdaq?] e
1377 record this change to 'editedfile'? [Ynesfdaq?] e
1377
1378
1378 no changes to record
1379 no changes to record
1380 [1]
1379 $ cat editedfile
1381 $ cat editedfile
1380 This change will not be committed
1382 This change will not be committed
1381 This is the second line
1383 This is the second line
@@ -1487,6 +1489,7 b' session'
1487 record this change to 'editedfile'? [Ynesfdaq?] n
1489 record this change to 'editedfile'? [Ynesfdaq?] n
1488
1490
1489 no changes to record
1491 no changes to record
1492 [1]
1490
1493
1491
1494
1492 random text in random positions is still an error
1495 random text in random positions is still an error
General Comments 0
You need to be logged in to leave comments. Login now