- Mar 01, 2014
-
-
Matt Mackall authored
-
Mads Kiilerich 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 27, 2014
-
-
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 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
-
- Feb 23, 2014
-
-
Katsunori FUJIWARA authored
-
- Feb 16, 2014
-
-
Wagner Bruna authored
-
- Feb 19, 2014
-
-
Danek Duvall authored
Compiling mercurial with the Sun Studio compiler gives seven copies of the following warning on pathencode.c: line 533: warning: initializer will be sign-extended: -1 Using explicit unsigned literals silences it.
-
Yuya Nishihara authored
Since a959f7167077, repo.cancopy() cannot be used to check if the repo is a bundlerepository. repo.url() should always have "scheme:", so it isn't necessary to parse by util.url().
-
Yuya Nishihara authored
If sys is still a demandmod, reload(sys) fails with "TypeError: reload() argument must be module".
-
- Feb 15, 2014
-
-
Yuya Nishihara authored
If the currently active bookmark is divergent one, it may be resolved during rebase. Trying to activate it will raise "KeyError: 'W@diverge'".
-
- Feb 13, 2014
-
-
Thomas Arendsen Hein authored
The certificate was updated in February 2014. You can verify the certificate by using the Root CA certificate downloadable from https://ssl.intevation.de/ The intermediate CA is sent by https://hg.intevation.org/
-
- Feb 10, 2014
-
-
Brodie Rao authored
This fixes an issue introduced in d7c28954d901 where, when disabling demandimport while running hooks, it's inadvertently re-enabled even when it was never enabled in the first place. This doesn't affect normal command line usage of Mercurial; it only matters when Mercurial is run with demandimport intentionally disabled.
-
- Feb 09, 2014
-
-
Mads Kiilerich authored
Merge could overwrite untracked files and cause data loss. Instead we now handle the 'local side removed file and has untracked file instead' case as the 'other side added file that local has untracked' case: FILE: untracked file exists abort: untracked files in working directory differ from files in requested revision It could perhaps make sense to create .orig files when overwriting, either instead of aborting or when overwriting anyway because of force ... but for now we stay consistent with similar cases.
-
- Feb 05, 2014
-
-
Matt Mackall authored
A correct patch for this has existed in Python's BTS for 3 years (http://bugs.python.org/issue9291), so waiting for it to be fixed upstream is probably not a viable strategy. Instead, we add this horrible hack to workaround the issue in existing copies of Python 2.4-2.7.
-
- Feb 03, 2014
-
-
Siddharth Agarwal authored
hg.islocal doesn't work for paths pointing to non-repos, such as patch files.
-
Siddharth Agarwal authored
Previously we used hg.islocal, which doesn't work for paths pointing to non-repos, such as patch files.
-
Siddharth Agarwal authored
This returns True if the URL represents a path that can be opened locally, without needing to go through the entire URL open mechanism.
-
- Feb 01, 2014
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Jan 31, 2014
-
-
Wagner Bruna authored
-
Katsunori FUJIWARA authored
Before this patch, "ja.po" translation causes test-gendoc.t failure with old docutils: It fails with docutils 0.7, but not with 0.11.
-
- Jan 30, 2014
-
-
Simon Heimberg authored
I mainly did the simple cases, like removing ".. note::", changing single quotes to double quotes and adapting underlining. Unhelpful msgstr in fuzzy entries are removed. (They were suggestions by the program msgmerge.)
-
- Jan 22, 2014
-
-
Simon Heimberg authored
Do this in a separate patch for easier reviewing of the translation patch.
-
Simon Heimberg authored
Strip the locations by running msgcat [1] as the wiki [2] tells to do. Do this in a separate patch for getting a smaller one when updating from hg.pot. [1] msgcat --no-location -o de.po de.po [2] mercurial.selenic.com/wiki/TranslatingMercurial#Updating_a_Translation
-
- Jan 31, 2014
-
-
Pierre-Yves David authored
Before this patch rebase crashed badly when it happend. (not abort, crash). Fix courtesy of Matt Mackall.
-
Pierre-Yves David authored
Record was changing the current directory to `repo.root` in order to be able to feed `command.commit` file name relative to this `repo.root`. This is a bit overkill and prevent an incoming fix to rebase. This would also break multi-threaded usage. Instead we just feed `command.commit` with absolute path name. works as well as before but without chdir.
-
- Jan 29, 2014
-
-
Angel Ezquerra authored
The existing description was a bit hard to understand.
-
- Jan 30, 2014
-
-
Pierre-Yves David authored
Before this changeset local clone of a repo with hidden changeset would include then in the clone (why not) and turn them public (plain wrong). This happened because the copy clone publish by dropping the phaseroot file entirely making everything in the repo public (and therefore immune to obsolescence marker). This changeset takes the simplest fix, we deny the copy clone in the case of hidden changeset falling back to pull clone that will exclude them from the clone and therefore not turning them public. A smarter version of copy clone could be done, but I prefer to go for the simplest solution first.
-
- Jan 28, 2014
-
-
lstewart authored
The fix for issue2653 broke the ability to map the default branch of a source repository to a non-default named branch in the destination repository. Leave the default behaviour as is, but allow the branch name "None" to be used to map to a non-default named branch in the destination repository.
-