- May 09, 2014
-
-
Pierre-Yves David authored
The `hg import` command gains a `--partial` flag. When specified, a commit will always be created from a patch import. Any hunk that fails to apply will create .rej file, same as what `hg qimport` would do. This change is mainly aimed at preserving changeset metadata when applying a patch, something very important for reviewers. In case of failure with `--partial`, `hg import` returns 1 and the following message is displayed: patch applied partially (fix the .rej files and run `hg commit --amend`) When multiple patches are imported, we stop at the first one with failed hunks. In the future, someone may feel brave enough to tackle a --continue flag to import.
-
- May 18, 2014
-
-
Mads Kiilerich authored
Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
-
- May 01, 2014
-
-
Mads Kiilerich authored
-
- May 26, 2014
-
-
durin42 authored
-
- Apr 29, 2014
-
-
Pierre-Yves David authored
We add a -R/--repo option to run the benchmarks on another repository. This is very useful as some repository are bigger/more interesting than the mercurial one.
-
Pierre-Yves David authored
Before this changeset, you had to stand in the root of the mercurial repo to run the `revsetbenchmark.py` script. Otherwise, the perf extension would not be found a `./contrib/perf.py` and the script would crash in panic. We now figure out the contrib directory from the location of this script. This makes it possible to run the script from other location that the mercurial repo root (but you still need to be in the core mercurial repository)
-
- May 16, 2014
-
-
Pierre-Yves David authored
Python on Windows apparently use encoded stream by default. We use the same trick than elsewhere in the code to make them binary. This should fix the current buildbot failure on windows.
-
- May 19, 2014
-
-
Pierre-Yves David authored
This revset is used in evolve. The new revset lazyness should make it all faster but in practice it is significantly slower. Below is a timing for this entry on my Mercurial repo. 2.9.2) ! wall 0.034598 comb 0.040000 user 0.040000 sys 0.000000 (best of 100) 3.0+@) ! wall 0.062268 comb 0.060000 user 0.060000 sys 0.000000 (best of 100) The ~20 have been taken arbitrary.
-
- Feb 28, 2014
-
-
Mads Kiilerich authored
This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.
-
- May 20, 2014
-
-
Pierre-Yves David authored
The ``localrepo.writepending`` method is using the ``changelog._delaybuff`` attribute to know if it has anything to do. However the ``changelog._delaybuff`` is never initialised at ``__init__`` time. This can lead to crash when using bundle2 for part that never touch the changelog. We simply initialize it to its base value. This is scheduled for stable as it both trivial and blocking for experimenting with bundle2.
-
- May 22, 2014
-
-
Yuya Nishihara authored
With Python 2.7.7rc1, "hg pull" through HTTP CONNECT tunnel fails due to the removal of _set_hostport [1]. ... File "mercurial/url.py", line 372, in https_open return self.do_open(self._makeconnection, req) ... File "mercurial/url.py", line 342, in connect _generic_proxytunnel(self) File "mercurial/url.py", line 228, in _generic_proxytunnel self._set_hostport(self.host, self.port) AttributeError: httpsconnection instance has no attribute '_set_hostport' self._set_hostport(self.host, self.port) should be noop and can be removed because: - _set_hostport() [2] was the function to parse "host:port" string and set them to self.host and self.port, - and (self.host, self.port) pair should be valid since connect() is called prior to _generic_proxytunnel(). [1]: http://hg.python.org/cpython/rev/568041fd8090 [2]: http://hg.python.org/cpython/file/3a1db0d2747e/Lib/httplib.py#l721
-
- May 23, 2014
-
-
Jim Hague authored
Bugzilla 4.4.3 and later remove the old cookie based session authentication from the Web Services API and replace it with a login token. The session can now also be restricted to the originating IP. Add the necessary to the extension so it works with 4.4.3 and later.
-
Siddharth Agarwal authored
This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.
-
Durham Goode authored
Previously the ifcontains revset was checking against the set using a pure __contains__ check. It turns out the set was actually a list of formatted strings meant for ui output, which meant the contains check failed if the formatted string wasn't significantly different from the raw value. This change makes it check against the raw data, prior to it being formatted.
-
- May 25, 2014
-
-
Mads Kiilerich authored
a36cc85a5b7b did more than what the description said and introduced a bug.
-
Mads Kiilerich authored
-
- May 10, 2014
-
-
Durham Goode authored
Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.
-
- May 09, 2014
-
-
Gregory Szorc authored
-
Gregory Szorc authored
-
- Apr 25, 2014
-
-
Gregory Szorc authored
There is little reason for the data members of TestRunner to be public, as they are implementation details. Enforce it through naming.
-
Gregory Szorc authored
With this change, TestSuite no longer accesses anything on TestRunner and the TestRunner is no longer passed to TestSuite.
-
Gregory Szorc authored
-
Gregory Szorc authored
This was the last usage of option in ``TextTestRunner.run``.
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
This starts a series of patches that will lessen the importance of TestRunner. It will remove the TestRunner instance stored inside the TestSuite.
-
- May 16, 2014
-
-
Durham Goode authored
Adds a more detailed description of what 'local' and 'other' mean to the merge tool documentation.
-
- May 08, 2014
-
-
Durham Goode authored
Changes rebase conflict markers to say 'source' and 'dest' instead of 'local' and 'other'. This ends up looking like: one <<<<<<< dest: a3e5c7fd master - bob: "A commit to master" master ======= mine >>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch" three
-
- May 10, 2014
-
-
Durham Goode authored
Changes the graft conflict markers to be 'graft' and 'local' to make it more intuitive which side is which.
-
- May 08, 2014
-
-
Durham Goode authored
Adds a labels function parameter to all the functions between merge.update and filemerge.filemerge. This will allow commands like rebase to specify custom marker labels.
-
- Apr 22, 2014
-
-
Gregory Szorc authored
We shouldn't be performing interactive prompting during test execution. The first step of this is to move the functionality into TestResult.
-
Gregory Szorc authored
-
Gregory Szorc authored
TestResult is the thing that captures all our test results. It's logical for diff viewing to be handled there and not inside Test. While writing this patch, it was discovered that Test.fail() was printing redundant test result output. This has been removed. Arguments controlling diffs have been removed from Test.__init__.
-
Gregory Szorc authored
The global abort flag has been moved into each Test instance. A Test.abort() accomplishing the same thing has been added.
-
- May 08, 2014
-
-
Durham Goode authored
Adds a conflict marker formatter that can produce custom conflict marker descriptions. It can be set via ui.mergemarkertemplate. The old behavior can be used still by setting ui.mergemarkers=basic. The default format is similar to: {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}" And renders as: contextblahblah <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch" line from my changes ======= line from the other changes >>>>>>> other: a3e55d7f4d38 master - sid0: "This is a commit to master th... morecontextblahblah
-
- Apr 22, 2014
-
-
Gregory Szorc authored
All options are now passed as arguments and we no longer need options. This enables us to instantiate Test from "plain old data" types. Since options must be given as arguments, it also makes people think harder about adding things that may not belong in Test. This will help ensure a proper separation of responsibility going forward.
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
Instead of making port numbers derived from count and a global initial port, we now pass a start port to Test.__init__ and do the calculation at a higher level.
-