- Dec 02, 2014
-
-
Pierre-Yves David authored
Revtodo happens to share its value with nullrev, but this is an implementation details, so we move away from it. After this changeset one can successfully change the values for all the constants and the tests still pass, but doing so would require more refactoring if we want to avoid breaking backward compatibility on the state file.
-
Pierre-Yves David authored
The state mapping is using '-1' to mark revisions that have not been rebased yet. We introduce and use a constant for that purpose. This will help emphasize the fact the value means something other than nullrev.
-
- Dec 04, 2014
-
-
Pierre-Yves David authored
The fact that the state for "not yet rebased" is -1 is an implementation details. So we change the comparisons to some semantically more correct.
-
- Dec 03, 2014
-
-
Pierre-Yves David authored
When set to true, this option will make patchbomb always ask for confirmation before sending the email. Confirmation is a powerful way to prevent stupid mistakes when the sending patches. This should let me get rid of my global alias adding --confirm to hg email. I know that some people may get bitten when moving from a machine with confirm configured to a machine where it is not, but I think it is worth the risk.
-
Pierre-Yves David authored
This option allows the user to control the default behavior for including an introduction message. This avoids having to tirelessly skip the intro for people contributing to Mercurial. The three possibles values are: - always, - auto (default, current behavior), - never. I was thinking of ("true", "false", "") (empty value being auto) but I ruled it out as too confusing. This new config option reuses the pre-existing 'patchbomb' section.
-
Pierre-Yves David authored
This continues my crusade against closure complication.
-
- Nov 21, 2014
-
-
Pierre-Yves David authored
It is used to benchmark the obsstore initialization time.
-
- Nov 19, 2014
-
-
Mads Kiilerich authored
We want to collect all calculation in one place.
-
- Dec 05, 2014
-
-
Martin von Zweigbergk authored
In a34a99181f36 (largefiles: don't show largefile/normal prompts if one side is unchanged, 2014-12-01), overridecalculateupdates() started checking for false modify/delete conflicts in large files and their standins. Then, in the very next changeset, 902554884335 (merge: before cd/dc prompt, check that changed side really changed, 2014-12-01), calculateupdates() itself started checking for false modify/delete conflicts in all files. Since "large files and their standins" is a subset of "all files", we can now drop the checks in overridecalculateupdates().
-
- Dec 03, 2014
-
-
Martin von Zweigbergk authored
Most merge action messages don't describe the action itself, they describe the reason the action was taken. The only exeption is the 'k' action, for which the message is just "keep" and instead there is a code comment folling it that says "remote unchanged". Let's move that comment into the merge action message.
-
- Dec 05, 2014
-
-
Matt Harbison authored
This fixes the previously mentioned issue with 3778884197f0, and undoes its corresponding test change. The test change demonstrates the correctness when a file is specified (i.e. the glob is required on Windows because relative paths use '\' and absolute paths use '/'). It is admittedly very subtle, but there will be a more robust test in the addremove -S v3 series.
-
Matt Harbison authored
Several methods print files relative to the repo root, unless files are named on the command line, in which case they are printed relative to cwd. Since the check relies on the 'pats' parameter, which needs to be replaced by a matcher when adding subrepo support, this logic gets folded into the matcher to tidy up the callers. Prior to 3778884197f0, this style decision was based off of whether or not the 'pats' list was empty. That change altered the check to test match.anypats() instead, in order to make paths printed consistent when -I/-X is specified. That however, changed the style when a file is given to the command. So now we test the pattern list to get the old behavior for files, as well as test -I/-X to get the consistency for patterns.
-
Matt Mackall authored
-
- Nov 17, 2014
-
-
Martin von Zweigbergk authored
When looking for untracked files that would conflict with a tracked file in the target revision (or the remote side of a merge), we explcitly exclude ignored files. The code was added in 7e30f5f2285f (merge: refactor unknown file conflict checking, 2012-02-09), but it seems like only unknown, not ignored, files were considered since the beginning of time. Although ignored files are mostly build outputs and backup files, we should still not overwrite them. Fix by simply removing the explicit check.
-
- Dec 03, 2014
-
-
Martin von Zweigbergk authored
We don't seem to have any tests for updating to another revision when there are untracked files on the local side that conflict with the those on the remote side, so let's add tests. This shows how we overwrite untracked ignored files when updating to a revision that tracks the file.
-
Martin von Zweigbergk authored
When the local side has renamed a directory from a/ to b/ and added a file b/c in it, and the remote side has added a file a/c, we end up overwriting the local file b/c with the contents of remote file a/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename get ('dg') action.
-
Martin von Zweigbergk authored
When the remote side has renamed a directory from a/ to b/ and added a file b/c in it, and the local side has added a file a/c, we end up moving a/c to b/c without considering the remote version of b/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename ('dm') action.
-
- Nov 23, 2014
-
-
Martin von Zweigbergk authored
-
Martin von Zweigbergk authored
There are three high-level cases that are of interest in manifestmerge(): 1) The file exists on both sides, 2) The file exists only on the local side, and 3) The file exists only on the remote side. Let's make this clearer in the code. The 'if f in copied' case will be broken up into the two applicable branches in the next patch.
-
- Dec 03, 2014
-
-
Martin von Zweigbergk authored
The "nothing to merge" case is covered by test-merge-default.t. The "uncommitted changes" case is covered by test-merge1.t (and others). The "merge -f" case is covered by test-merge-force.t.
-
- Nov 21, 2014
-
-
Martin von Zweigbergk authored
In overridecalculateupdates(), 'g' (get) actions may be converted into other actions. In most of these cases, it does not make sense to keep the action's message. For example, 'remote created' does not make sense for an 'r' (remove) action.
-
Martin von Zweigbergk authored
The message in the action is used for debugging and should not be the same as the question presented to the user. Use a different variable for the user message, so the 'msg' variable already in scope does not get overwritten.
-
- Dec 03, 2014
-
-
Ryan McElroy authored
This will allow the share extension to extend bookmarks functionality to share bookmarks between repositories.
-
- Dec 04, 2014
-
-
Mike Edgar authored
Currently, the revlog index C implementation assumes its node tree will be initialized before a new element is inserted by revnum. For example, revlog.py executes 'self.index.insert(-1, e)' in _addrevision(). This is only safe because the node tree has been initialized by a "node in self.nodemap" check made in addrevision(). (For context, this was discovered while developing an experimental revlog mixin which stores "elided nodes" via a separate code path from _addrevision(); that new code path segfaults without this patch.)
-
- Dec 03, 2014
-
-
Yuya Nishihara authored
There is no reason to disable it in hgweb because the same query can be written without using 'only()'.
-
Yuya Nishihara authored
-
Matt Harbison authored
This was triggered by 3778884197f0.
-
Martin von Zweigbergk authored
Changset 88629daa727b (merge: demonstrate that directory renames can lose local file content, 2014-12-02) should clearly have added the reverse version of the test: where the remote side renamed a directory, added a new file in that directory, and the local directory added a conflicting file in the source directory. Add such a test now, and also touch up the ones already added slightly (e.g. 'local' was a stupid value for content that can be on either side of a merge).
-
Martin von Zweigbergk authored
One of the graft tests grafts a changeset that changes a file's content from 'a' to 'b' onto a branch that has changed the file's content from 'a', via 'b', and then back to 'a' again. To prepare for not considering this a file in need of merging, let's use 'c' as the file's new content to make sure it has to be considered conflicting. There's a second similar case further down where an ancestor is grafted. Make sure that is also considered a conflict.
-
John Coomes authored
This restores the add behavior prior to d8cdd46f426d and matches the behavior of addremove.
-
- Dec 02, 2014
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
-
Mads Kiilerich authored
-
- Nov 27, 2014
-
-
Ryan McElroy authored
-
- Dec 02, 2014
-
-
Matt Mackall authored
-
- Nov 19, 2014
-
-
Siddharth Agarwal authored
'hg diff' should naturally honor all diffopts.
-
Siddharth Agarwal authored
The whitespace ones are the only ones the annotate logic cares about anyway, so there's no visible impact.
-
Siddharth Agarwal authored
The notify output doesn't seem to be parseable anyway, what with the maxdiff config option. Plus it is designed mainly for servers where hopefully the admins are doing sensible things.
-
Siddharth Agarwal authored
JSON is meant to be parsed by computers, and format changes can break them.
-
Siddharth Agarwal authored
transplant uses diff purely internally.
-