- Dec 18, 2015
- Dec 14, 2015
-
-
Augie Fackler authored
This is relatively rarely used functionality, but migrating this to a matcher will make future work on narrow clones more feasible.
-
- Dec 05, 2015
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
All entries in extra dict are propagated by default since 88fde8db5307.
-
- Dec 03, 2015
-
-
Laurent Charignon authored
In 405320cd6198, I made the mistake of moving the step "clearing the status after a rebase" to inside the rebase transaction. This was wrong, since we don't want to clear the status (and the rebase state) if something went wrong during the transaction: if something goes wrong we want to keep the rebase state to be able to abort. It broke rebase with evolve + inhibit.
-
- Nov 12, 2015
-
-
Augie Fackler authored
localrepo.parents() has relatively few users, and most of those were actually implicitly looking at the wctx, which is now made explicit via repo[None].
-
- Nov 28, 2015
-
-
Mike Edgar authored
This corrects extra propagation for the rebase command and the shelve command.
-
- Nov 20, 2015
-
-
Laurent Charignon authored
Before this patch we were using the old api bookmarks.write instead of bookmarks.recordchange at the end of rebase operations. We move clearstatus within the transaction to make it easier for extensions that wrap transactions operations.
-
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.
-
- 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
-
- Nov 19, 2015
-
-
Matt Mackall authored
-
- Nov 15, 2015
-
-
liscju authored
So far pullrebase function has always returned None value, no matter what orig function returned. This behaviour made impossible for pull to change returned value from mercurial process (it has always ended with 0 value by default). This patch makes pullrebase returning with returned value from orig.
-
- Nov 08, 2015
-
-
Matt Harbison authored
Preserving the 'source' attribute of grafts started with a69a77a80900, which predates the introduction of 'intermediate-source' in 51930a7180bd by a year and a half. It looks like not preserving this was an oversight. On a related note, notice how the source value of 32af76 is no longer visible in the graph above this test. Is it reasonable to import the sha1 translation from evolve.py:relocate() into scmutil or similar, and use that to fixup these attributes as well as the commit message? (I realize that evolve is still experimental, but I don't see a way to do this from the evolve extension.)
-
- Oct 26, 2015
-
-
Stanislau Hlebik authored
-
Stanislau Hlebik authored
This parameter will allow us to set the date of rebased commits
-
- Oct 19, 2015
-
-
Mads Kiilerich authored
--collapse will do that rebase doesn't commit until the final commit. The lack of a new commit would make it look like the rebase didn't contribute any changes. Instead, only warn about no commits when not using --collapse.
-
- Oct 16, 2015
-
-
Mads Kiilerich authored
-
Katsunori FUJIWARA authored
Now, 'dirstate.write(tr)' delays writing in-memory changes out, if a transaction is running. This may cause treating this revision as "the first bad one" at bisecting in some cases using external hook process inside transaction scope, because some external hooks and editor process are still invoked without HG_PENDING and pending changes aren't visible to them. 'dirstate.write()' callers below in localrepo.py explicitly use 'None' as 'tr', because they can assume that no transaction is running: - just before starting transaction - at closing transaction, or - at unlocking wlock
-
- Oct 15, 2015
-
-
Christian Delahousse authored
Refactoring by reduce the scope of the try catch block so that it only captures what it needs. I could have made it smaller but another patch in the series will add onto it.
-
Christian Delahousse authored
When a user's repository is in an unfinished rebase state and they choose to abort, at a minimum, the repo should be out of that state. We've found situations where the user could not leave the state unless manually deleting the rebasestate file. This fix ensures that no matter what exception may be raised during the abort, the rebase state file will be deleted, the user will be out of the rebase state and they can get their repository into a workable condition.
-
Pierre-Yves David authored
We make the name consistent with the other similar revsets and make sure it has minimal tests.
-
Pierre-Yves David authored
There is little value in using the revset instead of the function.
-
Pierre-Yves David authored
This makes it much simple to wrap for other extension.
-
- Oct 13, 2015
-
-
Christian Delahousse authored
After rebasing a set of changes onto a public changeset and having the first one be skipped, if you try to abort, the operation fails. This fix adds a check to disallow the target rev into the dstates list within the abort function. This list is checked for immutable states before the rest of abort does its thing.
-
- Oct 14, 2015
-
-
Pierre-Yves David authored
As obsolescence markers can contains unknown nodes and 'allsuccessors' returns them, we have to protect again that when looking for successors of the rebase set in the destination. Test have been expanded to catch that.
-
Pierre-Yves David authored
Accessing 'repo.changelog' have a small overhead because we double check that the filtering did not changed. As we make multiple use of this into loops, we should avoid doing the lookup/check every time. This also make the code tidier.
-
- Oct 13, 2015
-
-
Ryan McElroy authored
A rebase call that results in nothing to rebase might be considered successful in some contexts. This factors out the return code from places where hg determines that there is nothing to rebase, so an extenion might change this return code to be something that would allow scripts to run without seeing this as an error.
-
Christian Delahousse authored
Added comments describing the state variable and constants used throughout the rebase extension
-
- Oct 08, 2015
-
-
Pierre-Yves David authored
The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be confused about that and gives all the credit to 'util' instead of the hardworking 'error'. In a spirit of equity, we break the cycle of injustice and give back to 'error' the respect it deserves. And screw that 'util' poser. For great justice.
-
- Oct 06, 2015
- Sep 30, 2015
-
-
Matt Mackall authored
-
- Sep 24, 2015
-
-
timeless authored
-
- Sep 15, 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 if they are being rebased on their successors. It introduces a new rebase state 'revprecursor' 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: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"
-
- Sep 17, 2015
-
-
Pierre-Yves David authored
This is the first step toward making the "default destination" logic more clear and unified. The revset is private because I'm happy to delay the bikeshedding until after the clean up happened.
-