- Nov 18, 2015
-
-
Siddharth Agarwal authored
For parity with merge --tool, rebase --tool etc. rebase.rebase overwrites the tool in repo.ui, so we need to explicitly pass it down there too.
-
Siddharth Agarwal authored
-
Siddharth Agarwal authored
For parity with strip -k, rebase -k, etc.
-
- Nov 01, 2015
-
-
Yuya Nishihara authored
This seems the convention of hgweb.
-
- Nov 19, 2015
-
-
Matt Mackall authored
-
Matt Mackall authored
We've globablly forced stat to return integer times which agrees with our extension code, so this is no longer needed. This speeds up status on mozilla-central substantially: $ hg perfstatus ! wall 0.190179 comb 0.180000 user 0.120000 sys 0.060000 (best of 53) $ hg perfstatus ! wall 0.275729 comb 0.270000 user 0.210000 sys 0.060000 (best of 36)
-
Matt Mackall authored
Alternate fix for this issue which avoids putting extra function calls and exception handling in the fast path. For almost all purposes, integer timestamps are preferable to Mercurial. It stores integer timestamps in the dirstate and would thus like to avoid doing any float/int comparisons or conversions. We will continue to have to deal with 1-second granularity on filesystems for quite some time, so this won't significantly hinder our capabilities. This has some impact on our file cache validation code in that it lowers timestamp resolution. But as we still have to deal with low-resolution filesystems, we're not relying on this anyway. An alternate approach is to use stat[ST_MTIME], which is guaranteed to be an integer. But since this support isn't already in our extension, we can't depend on it being available without adding a hard Python->C API dependency that's painful for people like yours truly who have bisect regularly and people without compilers.
-
- Nov 18, 2015
-
-
Laurent Charignon authored
This patch removes the repetition of "(revignored, revprecursor, revpruned)" and replaces its occurences with the more legible "revskipped".
-
- Nov 19, 2015
-
-
Laurent Charignon authored
Since we handled skipping obsolete revs when it is relevant, this todo is no longer useful. We replace the comment with two useful comments.
-
- Nov 18, 2015
-
-
Laurent Charignon authored
This patch avoids unnecessary conflicts to resolve during rebase for the users of changeset evolution. This patch modifies rebase to skip obsolete commits with no successor. It introduces a new rebase state 'revpruned' for these revisions that are being skipped and a new message to inform the user of what is happening. This feature is gated behind the config flag experimental.rebaseskipobsolete When an obsolete commit is skipped, the output is: note: not rebasing 7:360bbaa7d3ce "O", it has no successor
-
Laurent Charignon authored
We had left a lonely single quote where it shouldn't be!
-
- Nov 19, 2015
-
-
Matt Mackall authored
-
- Nov 01, 2015
-
-
Yuya Nishihara authored
It will be enforced by the import checker.
-
Yuya Nishihara authored
It will be enforced by the import checker.
-
Yuya Nishihara authored
It will be enforced by the import checker.
-
- Nov 17, 2015
-
-
Siddharth Agarwal authored
Will aid in testing.
-
Siddharth Agarwal authored
With this patch, mergestate.clean() will no longer abort when it encounters an unsupported merge type. However we hold off on testing it until backwards compatibility is in place.
-
Siddharth Agarwal authored
We would normally use the read() constructor, but in this case it's fine because - we implement our own reading layer, so the extra parsing done by read() is unnecessary - read() can raise an exception for unsupported merge state records, but here we'd like to handle that separately - debugmergestate needs to be privy to mergestate internals anyway
-
- Nov 11, 2015
-
-
Christian Delahousse authored
Removes the named arguments and replaces them by accessing opts. This will be used in the next patch in the series because we'll be adding more flags to debugdirstate
-
- Nov 18, 2015
-
-
Christian Delahousse authored
On my machine, whenever I run all test with a high -j value, test-convert-git.t would consistently fail by displaying an estimate. This patch removes that value from the output.
-
- Nov 17, 2015
-
-
Laurent Charignon authored
Before this patch, mq was using repo._bookmarks.write. This patch replaces this code with the recommended way of saving bookmarks changes: repo._bookmarks.recordchange.
-
Laurent Charignon authored
We put the code to be indented in the next patch in a "if True:" block to make it easier to review.
-
Laurent Charignon authored
We move from the old api repo._bookmarks.write to the new api repo._bookmarks.recordchange.
-
- Nov 18, 2015
-
-
Laurent Charignon authored
Before this patch, making a commit on a local repo could move a bookmark and both operations would not be grouped as one transaction. This patch makes both operations part of one transaction. This is necessary to switch to the new api to save bookmarks repo._bookmarks.recordchange if we don't want to change the current behavior of rollback. Dirstate change happening after the commit is done is now part of the transaction mentioned above. This leads to a change in the expected output of several tests. The change to test-fncache happens because both lock are now released in the same finally clause. The lock release is made explicitly buggy in this test. Previously releasing lock would crash triggering release of wlock that crashes too. Now lock release crash does not directly result in the release of wlock. Instead wlock is released at garbage collection time and the error raised at that time "confuses" python.
-
- Nov 17, 2015
-
-
Siddharth Agarwal authored
See previous patches for why we're doing this.
-
Siddharth Agarwal authored
See previous patches for why we're doing this.
-
Siddharth Agarwal authored
See previous patches for why we're doing this.
-
Siddharth Agarwal authored
See previous patch for why we're doing this. We do this with a bit of care -- it would be bad form for 'hg summary' to abort completely if we encounter an unsupported merge record. Instead just warn about that and continue with the rest of the summary.
-
Siddharth Agarwal authored
See previous patches for why we're doing this.
-
Siddharth Agarwal authored
See previous patches for why we're doing this.
-
Siddharth Agarwal authored
At the moment it's the same as just creating a new mergestate, but we'll soon move the _read call out of __init__ and in here.
-
- Nov 18, 2015
-
-
Siddharth Agarwal authored
See the previous patches for why we're doing this.
-
Siddharth Agarwal authored
See the previous patches for why we're doing this.
-
Siddharth Agarwal authored
See the previous patches for why we're doing this.
-
Siddharth Agarwal authored
Eventually, we'll move the read call out of the constructor. This will: - avoid unnecessary reads when we're going to nuke the merge state anyway - avoid raising an exception if there's an unsupported merge record 'clean' seems like a good name for it because I wanted to avoid anything with the word 'new' in it, and 'reset' is more an action performed on a merge state than a way to get a new merge state. Thanks to Martin von Zweigbergk for feedback about naming this.
-
- Nov 17, 2015
-
-
Siddharth Agarwal authored
We're going to catch this exception in 'hg summary' to print a better error message. This code is pretty untested, so there are no changes to test output. In upcoming patches we're going to test the output more thoroughly.
-
Siddharth Agarwal authored
We're going to use this in summary to print a better error message.
-
Bryan O'Sullivan authored
Superseded by the parent of this commit.
-
Bryan O'Sullivan authored
This is a simpler and faster fix for issue4878 than the contortions performed in 502b56a9e897.
-
Bryan O'Sullivan authored
Found using the power of the mighty eyeball.
-