- Nov 16, 2015
-
-
Matt Harbison authored
The extension was failing to load on Windows because $TESTTMP contains a path component 'test', prefixed by a path separator '\'. That combination ends up converted to "...<tab>est...".
-
Matt Harbison authored
The other invocations aren't quoted, and Windows doesn't like the single quotes: diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -520,20 +520,8 @@ remote hook failure is attributed to rem $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc $ hg -q --config ui.ssh="python '$TESTDIR/dummyssh'" clone ssh://user@dummy/remote hookout + abort: no suitable response from remote hg! + [255] $ cd hookout + $TESTTMP.sh: line 264: cd: hookout: No such file or directory $ touch hookfailure - $ hg -q commit -A -m 'remote hook failure' ....
-
- Nov 20, 2015
-
-
Laurent Charignon authored
Before this patch, strip was using repo._bookmarks.write. This patch replaces this code with the recommended way of saving bookmarks changes: repo._bookmarks.recordchange.
-
Laurent Charignon authored
Before this patch we were using the old api bookmarks.write, this patches replaces its usage by bookmarks.recordchange, the new api to record bookmark changes.
-
- Nov 19, 2015
-
-
Siddharth Agarwal authored
The largefiles merge code (currently) does not handle change/delete conflicts. So fall back to regular filemerge in that case. Making this code handle change/delete conflicts is left as an exercise for the future.
-
- Nov 14, 2015
-
-
Siddharth Agarwal authored
This is the most natural way to represent these files. We also need to make sure we don't try to store these files in the merge store.
-
- Nov 20, 2015
-
-
Siddharth Agarwal authored
We will represent a deleted file as 'nullhex' in the in-memory and on-disk merge states. We need to be able to create absentfilectxes in that case, and delete the file from disk rather than try to write it out.
-
- Nov 14, 2015
-
-
Siddharth Agarwal authored
We set 'back' to None in this case, so we need to handle that as well.
-
- Oct 31, 2015
-
-
Yuya Nishihara authored
-
- Nov 01, 2015
-
-
Yuya Nishihara authored
There should be no practical reason to delay the import of wsgicgi.
-
Yuya Nishihara authored
This will avoid future warning spotted by the import checker.
-
Yuya Nishihara authored
It will be enforced by the import checker.
-
- Nov 14, 2015
-
-
Siddharth Agarwal authored
This is mostly for completeness' sake -- the current code shouldn't get to this point.
-
Siddharth Agarwal authored
This is mostly for completeness' sake -- at the moment we don't support any tools for change/delete conflicts that would do a premerge.
-
Siddharth Agarwal authored
Merge tools that perform an actual 3-way merge can't handle change/delete conflicts. This adds a check for that.
-
- Nov 16, 2015
-
-
Siddharth Agarwal authored
For --tool or HGMERGE, we could have either: (a) proceeded with the particular tool, then failed the merge. (b) chosen to prompt regardless. We're explicitly choosing (b) here, because it's effectively what we've been doing so far and helps maintain an easier-to-use interface. However, in future patches we're going to change the default selection from 'pick changed version' to 'leave unresolved'. That fixes most of the brokenness involved with choice (b).
-
- Nov 14, 2015
-
-
Siddharth Agarwal authored
We haven't added the 'leave unresolved' option yet -- that will come in a future patch.
-
- Nov 18, 2015
-
-
Siddharth Agarwal authored
This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.
-
Siddharth Agarwal authored
This covers two of the four cases of change/delete conflicts -- in an upcoming patch we'll make :other cover the other two.
-
- Nov 19, 2015
-
-
Siddharth Agarwal authored
In upcoming patches we're going to queue these actions up to be applied to the dirstate at the end.
-
- Nov 18, 2015
-
-
Siddharth Agarwal authored
This is required for change/delete conflict resolution -- see previous patches for more details.
-
Siddharth Agarwal authored
This is required for change/delete conflicts -- see the previous patch for more information.
-
Siddharth Agarwal authored
We're going to support the filemerge code resolving change/delete conflicts in upcoming patches. Some of these resolutions require that the dirstate be modified. Modifying the dirstate directly from in here would be (a) a pretty bad layering violation and (b) wrong because all dirstate removals should happen before adds. So in this and upcoming patches we're instead going to pass whether the file is deleted up to merge.mergestate, then in there figure out what dirstate action needs to be taken.
-
Siddharth Agarwal authored
We introduce a new record type, 'C', to indicate change/delete conflicts. This is a separate record type because older versions of Mercurial will not be able to handle these conflicts. We aren't actually storing any change/delete conflicts yet -- that will come in future patches.
-
- Nov 19, 2015
-
-
Shubhanshu Agrawal authored
Currently strip works with a single bookmark, the changes in this patch modifies the strip extension to accept a list of bookmarks
-
- Nov 15, 2015
-
-
Shubhanshu Agrawal authored
Currently strip works with a single bookmark, the changes in this patch modifies the strip module to work with a list of bookmarks Building on this we can take a list of bookmarks as input and remove all of them in a single go
-
- Nov 19, 2015
-
-
Pierre-Yves David authored
File matching is done by applying the matcher to all elements in the 'file' field of all changesets in the repository. This requires to read/parse all changesets in the repository and do a lot of matching. However about 1/3 of the time of the function is used to create 'changectx' object and retrieve their 'file' field. This is far too much overhead so we are skipping the changectx layer and directly access the data from the changelog. This provide use significant speed up: repository: mozilla central 252524 revisions command: hg perfrevset '_matchfiles("p:browser")' Before: 15.899687s After: 10.011705s Slowdown is even more significant if you have a lot of namespace that slowdown lookup. The time is now spent with this approximate repartition: Matcher: 20% regexp matching: 10% changelog.read: 80% reading revision: 60% checking hash: 15% decompression: 15% reading chunk: 30% changelog parsing: 20% decoding to local: 10% The next easy win is probably to have more of the changelog stack implemented using the CPython api.
-
- Nov 18, 2015
-
-
Siddharth Agarwal authored
This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.
-
- Nov 19, 2015
-
-
Siddharth Agarwal authored
I have no idea what I was thinking when I wrote this.
-
Siddharth Agarwal authored
The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.
-
- Nov 18, 2015
-
-
liscju authored
Help of status cmd defines status file of 'missing', what is called in fileset 'deleted'. To stay consistent this patch introduces missing() predicate which in fact is alias to 'deleted'.
-
- Nov 10, 2015
-
-
Anton Shestakov authored
_siblings is a helper that is used for displaying changeset parents and children in hgweb. Before, when it was a simple generator, it couldn't tell its length without being consumed, and that required a special case when preparing data for changeset template (see 9e1f4c65f5f5). Let's make it into a class (similar to templatekw._hybrid) that allows len(...) without side-effects.
-
- Nov 19, 2015
-
-
Siddharth Agarwal authored
This is too low-level to be the top-level documentation for mergestate. We're restricting the top-level documentation to only be about what consumers of the mergestate and anyone extending it need to care about.
-
- 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.
-