- Apr 14, 2015
-
-
Tony Tung authored
This will allow us to have --patch and --stat as standalone operations that don't require --list, as well as pairing them with --list.
-
- May 15, 2015
-
-
Matt Mackall authored
-
- Apr 14, 2015
-
-
Ryan McElroy authored
Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.
-
- Apr 27, 2015
-
-
Laurent Charignon authored
While fixing issue4304: "record: allow editing new files" we introduced changes in record/crecord. These changes need to be matched with changes in any command using record. Shelve is one of these commands and the changes have not been made for this release. Therefore, shelve -i should be an experimental feature for this release.
-
- Apr 12, 2015
-
-
Pierre-Yves David authored
Text book says that 'wlock' should be acquired before 'lock'. Caught through developer warning.
-
- Mar 25, 2015
-
-
Laurent Charignon authored
This allows us to shelve selectively part of the changes of the workdir
-
Laurent Charignon authored
-
- Jan 15, 2015
-
-
Eric Sumner authored
The next diff will add support for writing bundle2 files to writebundle, but the bundle2 generator wants access to a ui object. This changes the signature and callsites to pass one in.
-
Angel Ezquerra authored
This change touches every module in which repository.opener was being used, and changes it for the equivalent repository.vfs. This is meant to make it easier to split the repository.vfs into several separate vfs. It should now be possible to remove localrepo.opener.
-
- Oct 04, 2014
-
-
Martin von Zweigbergk authored
-
- Oct 10, 2014
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 08, 2014
-
-
Jordi Gutiérrez Hermoso authored
When unshelving and facing a conflict, if we resolve all conflicts in favour of the committed changes instead of the shelved changes, then the ensuing implicit rebase is a no-op. That is, there is nothing to rebase. In this case, there are no extra intermediate shelve commits to strip either. Prior to this change, the commit being unshelved to would be marked for destruction in a rather catastrophic way. The relevant part of the test case failed as follows: $ hg unshelve -c unshelve of 'default' complete $ hg diff warning: ignoring unknown working parent 33f7f61e6c5e! diff --git a/a/a b/a/a new file mode 100644 --- /dev/null b/a/a @@ -0,0 1,3 @@ a c x $ hg status warning: ignoring unknown working parent 33f7f61e6c5e! M a/a ? a/a.orig ? foo/foo $ hg summary warning: ignoring unknown working parent 33f7f61e6c5e! parent: -1:000000000000 (no revision checked out) branch: default commit: 1 modified, 2 unknown (new branch head) update: 4 new changesets (update) With this change, this test case now passes.
-
- Sep 25, 2014
-
-
Martin von Zweigbergk authored
-
- Sep 30, 2014
-
-
Martin von Zweigbergk authored
The contents of the .files file has not been used since 1d7a36ff2615 (shelve: use rebase instead of merge (issue4068), 2013-10-23), so stop writing it. Where we currently use the presence of the file as a check for a valid shelve name, switch to checking for the .patch file.
-
- Aug 15, 2014
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
_ is usually used for i18n markup but we also used it for I-don't-care variables. Instead, name don't-care variables in a slightly descriptive way but use the _ prefix to designate unused variable. This will mute some pyflakes "import '_' ... shadowed by loop variable" warnings.
-
Matt Mackall authored
This prepares for upcoming revert changes.
-
- Jul 24, 2014
-
-
Jordi Gutiérrez Hermoso authored
cset ba3bc6474bbf has removed this option. This commit just tidies the code that was associated to it. It also fixes the internal calls to the strip() function. Before this change, any function that thought it would want as a final safety to keep a partial backup bundle (bundling changes not linearly related to the current change being stripped), had to explicitly pass a backup="strip" option. With this change, these backups are always kept in case of an exception and always removed if there is no exception. Only full backups can be specified with backup=True or no full backups with backup=False.
-
- Aug 05, 2014
-
-
Pierre-Yves David authored
This removes the last manual phase movement in shelve.
-
Pierre-Yves David authored
We rely on the internal mechanism to commit the changeset in the right state. This is similar to what the mq extension is doing. This is an important change as we plan to move phase movement with the transaction. Avoiding phase movement from high level code will avoid them the burden of transaction handling. It is also important to limit the need for transaction handling as this limits the odds of people messing up. Most common expected mess-up is to use a different transaction for changesets creation and phase adjustment.
-
- Aug 02, 2014
-
-
Katsunori FUJIWARA authored
This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch: - 'shelve' is used as COMMAND - ROUTE is omitted
-
- Jun 20, 2014
-
-
Katsunori FUJIWARA authored
After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'.
-
Katsunori FUJIWARA authored
Before this patch, the name of a newly added option had to be added into each string that was passed to the "checkopt()" internal function: these are white-space-separated list of un-acceptable option names (= "black list" for the specified "opt"). This new option had to be added into multiple strings because each option could belong to only one action of "create", "cleanup", "delete" or "list". In addition to this redundancy, each string passed to "checkopt()" was already too long to include a new one. This patch refactors option combination check to make it easier to add a new option in a subsequent patch. New "checkopt()" only takes one action ("cleanup", "delete" or "list"), and checks whether all explicitly activated options are allowed for it or not (if specified action is activated in "opts"). The "date" entry is listed in "allowables", but commented out, because: - "date" shouldn't be checked for test checking "date" causes unexpected failure of "test-shelve.t", because "run-test.py" puts "[default] shelve = --date '0 0'" into hgrc. - explicitly listing it can advertise that ignoring it is intentional This patch doesn't choose "white list" for the specified "opt", to avoid treating global options.
-
- Apr 14, 2014
-
-
Pierre-Yves David authored
The bundle2 unbundler needs a ui argument. We are now passing this information to `readbundle`.
-
Pierre-Yves David authored
The `readbundle` function is going to understand the bundle2 header. We move the function to a more suitable place before making any other changes.
-
- Mar 08, 2014
-
-
Katsunori FUJIWARA authored
-
Katsunori FUJIWARA authored
"applybundle()" also includes "addchangegroup()" invocation to encapsulate "vfs.join()" inside it.
-
- Apr 07, 2014
-
-
Mads Kiilerich authored
Using a fixed date makes hashes stable and makes debugging simpler. The date and hashes of this changeset are normally not exposed.
-
Mads Kiilerich authored
Don't confuse hackers!
-
- Apr 04, 2014
-
-
Matt Mackall authored
-
Sean Farley authored
-
- Apr 01, 2014
-
-
Pierre-Yves David authored
This is a gratuitous code move aimed at reducing the localrepo bloatness. The method had few callers, not enough to be kept in local repo.
-
Pierre-Yves David authored
This is a gratuitous code move aimed at reducing the localrepo bloatness. The method had few callers, not enough to be kept in local repo. The peer API remains unchanged.
-
- Feb 09, 2014
-
-
Mads Kiilerich authored
It was hard for the user to know what was going on when unshelving - especially if the user had to resolve conflicts and thus got to see the intermediate states. Seeing that pending changes was gone could scare the user, make him panic, and do stuff that really made him lose data. Merging (both when rebasing and with pending changes) also requires some understanding of where in the process you are and what you are merging. To help the user we now show a couple of status messages (when relevant): temporarily committing pending changes (restore with 'hg unshelve --abort') rebasing shelved changes
-
Mads Kiilerich authored
unshelve was quite verbose and it was hard for a user to follow what really was going on. It ended up saying 'added 1 changesets' ... but the user just expected and got pending changes and never saw any changeset. The use of bundles is an implementation detail that we don't have to leak here. Pulling is quite verbose, optimized for pulling many changesets from remote repos - that is not the case here. Instead, set the quiet flag when pulling the bundle - not only when temporarily committing pending changes. The 'finally' restore of ui.quiet is moved to the outer try/finally used for locking.
-
Mads Kiilerich authored
The shelved changes _could_ perhaps be amended to the parent changeset but it _is_ not the parent changeset. Using the description from the parent changeset is thus wrong and confusing. Instead, add a 'changes to' prefix.
-
Mads Kiilerich authored
Shelve do normally take a list of files or patterns to shelve and the command summary should thus show [FILE]... Note: --delete is a bit special and interpret the parameters as a list of shelve names. This change makes that even less obvious from the help. Too bad - we can't please everyone.
-
Mads Kiilerich authored
-
Mads Kiilerich authored
publicancestors returned the parents of the public ancestors ... and changegroupsubset used the parents of these as base for the bundle. That gave bundles with one layer of changesets more than necessary.
-