- Feb 13, 2014
-
-
Simon Heimberg authored
When the base is not found, we should not raise a traceback about a not defined variable. This hides the real problem: the function rebasenode was (probably) called wrong. An AssertionError is raised to highlight that the caller of the function did something wrong. An alternative approach is to only assign None to the variable "base" and let the merge mechanism raise an abort message. This was the behaviour for this case before ad9db007656f. But the only known case for this problem is when an extension calls this function wrong. An AssertionError makes this clearer than an abort message. When a different case is detected, the behaviour can be improved then.
-
- Feb 28, 2014
-
-
Siddharth Agarwal authored
'remote' is actually the remote, not the repo one is pulling into. This confused me quite a bit.
-
Matt Mackall authored
-
- Feb 26, 2014
-
-
Pierre-Yves David authored
We can use the "other" data from the recorded merge state instead of inferring what the other could be from working copy parent. This will allow resolve to fulfil its duty even when the second parent have been dropped. Most direct benefit is fixing a regression in backout.
-
Pierre-Yves David authored
This data is mostly redundant with the "other" changeset node (+ other changeset file path). However, more data never hurt. The old format do not store it so this require some dancing to add and remove it on demand.
-
- Feb 27, 2014
-
-
Pierre-Yves David authored
When we have to fallback to the old version of the file, we infer the "other" from current working directory parent. The same way it is currently done in the resolve command. This is know to have shortcoming… but we cannot do better from the data contained in the old file format. This is actually the motivation to add this new file format.
-
- Feb 26, 2014
-
-
Pierre-Yves David authored
We need to record the merge we were merging with. This solve multiple bug with resolve when dropping the second parent after a merge. This happen a lot when doing special merge (overriding the ancestor). Backout, shelve, rebase, etc. can takes advantage of it. This changeset just add the information in the merge state. We'll use it in the resolve process in a later changeset.
-
Pierre-Yves David authored
This new format will allow us to address common bugs while doing special merge (graft, backout, rebase…) and record user choice during conflict resolution. The format is open so we can add more record for future usage. This file still store hexified version of node to help human willing to debug it by hand. The overhead or oversize are not expected be an issue. The old format is still used. It will be written to disk along side the newer format. And at parse time we detect if the data from old version of the mergestate are different from the one in the new version file. If its the same, both have most likely be written at the same time and you can trust the extra data from the new file. If it differs, the old file have been written by an older version of mercurial that did not knew about the new file. In that case we use the content of the old file.
-
- Feb 27, 2014
-
-
Pierre-Yves David authored
The format of the file is unchanged. But we are preparing a new file with a new format that would be record based. So we change all the read/write logic to handle a list of record until a very low level. This will allow simple plugging of the new format in the current code.
-
- Feb 26, 2014
-
-
Pierre-Yves David authored
We are about to change the format. Having the file path in a single place make it easier to update the filename for the new version.
-
- Feb 13, 2014
-
-
Lucas Moscovicz authored
$ time hg log -qr "first(0:tip or draft())" ... real 0m1.032s user 0m0.841s sys 0m0.179s $ time ./hg log -qr "first(0:tip or draft())" ... real 0m0.378s user 0m0.291s sys 0m0.085s
-
Lucas Moscovicz authored
Performance Benchmarking: $ time hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m3.875s user 0m3.818s sys 0m0.051s $ time ./hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m0.213s user 0m0.174s sys 0m0.038s
-
- Feb 25, 2014
-
-
Pierre-Yves David authored
We can already use "for mark in store:" it make sense to allow "len(store)" too.
-
Pierre-Yves David authored
The obsstore method now have a return value. This informs caller about the actual creation of a new markers. No new markers are created if it would have been a duplicate.
-
- Feb 27, 2014
-
-
Matt Mackall authored
-
durin42 authored
-
durin42 authored
This demonstrates the defect that deprecated extensions show up in the output. A followup patch will fix this defect.
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
anuraggoel authored
Now hgweb style='coal' adds no extra blank in file view.
-
- Feb 25, 2014
-
-
Piotr Klecha authored
When pulling changes from a compressed bundle Mercurial first uncompresses it to a temporary file in .hg directory. This file will not be deleted unless the bundlerepo (other) is explicitly closed. This is similar to cleanup that occurs after incoming.
-
- Feb 26, 2014
-
-
Paul Boddie authored
Until now, repositories did not provide any value for isdirectory in rows produced for the index output, and thus isdirectory was generally evaluated as None for each index entry representing a repository. However, directories (visible when viewed with the descend and collapse settings enabled) did provide a value of True and this value appeared to persist in subsequent rows processed by the templater, causing isdirectory tests in templates to produce incorrect results for index entries appearing after directories. This patch asserts the None value for repositories, thus erasing any such persistent True values.
-
- Feb 27, 2014
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
This launches the preferred editor on either: a) the first non-empty user rc file found b) the first user rc file in the search list
-
Pierre-Yves David authored
With this small refactoring, the computation of the action to perform and the actual change to the disk happen in different function. This allows extension to wrap the later in case of need. The initial motivation is the `remotefilelog` extension that need to prefetch all the file content to be checked out.
-
Matt Mackall authored
Preparation for adding config --edit to launch an editor
-
Lucas Moscovicz authored
Now %ln expression goes through _hexlist and doesn't do any unnecesary processing anymore.
-
- Feb 26, 2014
-
-
Matt Mackall authored
-
Olle Lundberg authored
-
Lucas Moscovicz authored
Now %ld expression goes through _intlist and doesn't do any unnecesary processing anymore.
-
- Feb 25, 2014
-
-
anuraggoel authored
Now "hg purge -p" commands avoids printiing duplication of filenames. Second patch is the test coverage of first patch which tells that '-p' does not depend on whether ui.verbose is configured or not,that means it is independent of '-v'.
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Feb 23, 2014
-
-
Katsunori FUJIWARA authored
-
- Feb 16, 2014
-
-
Wagner Bruna authored
-
- Feb 24, 2014
-
-
Lucas Moscovicz authored
Removed one call to the append method
-
anuraggoel authored
When user type "hg push" command then this patch helps user by providing hint if no default path is configured. Second patch is the test coverage, to test the change behaviour of first patch.
-