Questions tagged [mercurial]

1

votes
1

answer
54

Views

Can I color hg log output based on content?

Is it possible to color each line of hg log output based on the individual changeset's content and/or description? For instance, I'd like to help the 'real' work stand out, by graying out the lines for merges and the lines for changes that only touch testing resources (no programming language files...
Joshua Goldberg
1

votes
0

answer
28

Views

Mercurial: Tracking configuration files, but in a different branch

In my current project I have followed the usual advice for configuration files: Commit configuration files as templates, then copy them to another location so that configuration settings don't end up in the change history. However, it is nice to be able to track the history of configuration files as...
alexis
1

votes
0

answer
40

Views

Updating a local mercurial copy with a specific commit from another remote site

(I'm using real examples, so it is clearer.) I cloned an official Mercurial repository locally hg clone https://bitbucket.org/Coin3D/soqt -r default from this repo: https://bitbucket.org/Coin3D/soqt/branch/default Now I want to update my local copy with a commit taken from a remote fork of the main...
rmbianchi
1

votes
0

answer
107

Views

Mercurial rename(only case change) a directory with files inside it in single commit

Problem: Existing folder 'Validator' has 3 files inside it, if I want to rename it to 'validator'(only case change), TortoiseHg is creating a subdirectory in Validator and moves 3 file inside it (Validator/validator/). How can I commit such rename in JUST 1 commit? Workaround: Rename Validator to 't...
Abs
1

votes
0

answer
32

Views

Mercurial merge losing existing lines

I'm trying to merge a branch into the trunk. Trunk has file with code added but when I merge the branch into it, the code disappears. In the branch, the file is present but code is not. I'm using TortoiseHg for the merge. 'Discard all changes from the other revision' is unchecked and there are no me...
Bill Martin
1

votes
0

answer
71

Views

How can I reduce the size of a hg subrepo without breaking links to the parent repo?

I am trying to upload my repositories to Bitbucket. It's a parent repository and a handful of subrepos. One of the subrepos is so big (and my connection is throttled) that Bitbucket times out before it finishes the import. I am hopeful that if I make the subrepo small enough I will be able to upload...
Cathalson
1

votes
1

answer
54

Views

Mercurial: Import another repository as new branch

Scenario: I have two Mercurial repositories, let's call them 'Original' and 'NewProduct'. Original has 1072 revisions of history. NewProduct was created as follows: Update Original to tip (r1072) Copy working directory to a new folder Create repository NewProduct in that folder Add all files and per...
Aki Kanerva
1

votes
1

answer
38

Views

tortoisehg hangs on update after using rebase + strip on multiple branches

First things first, I'm a total moron for even being in this position at all. Newish dev with < 2 years experience and not a lot of time with version control, much less hg and tortoisehg. I wanted to revert a merge, so after several failed attempts to create a new branch from my last good commit and...
Roll_Fizzlebeef
1

votes
2

answer
151

Views

hg merge on command line hangs after first file merge

I've configured my command line hg to use p4merge. When I merge in a branch and there is a conflict, hg opens p4merge, to which I resolve the issues, save, then close p4 merge. Meanwhile... The command line is stuck on: running merge tool p4mergeosx for file There is no way to tell the command l...
TheJeff
1

votes
1

answer
35

Views

How to make a backup of (only) some system files with Mercurial

Making a repository out of a given directory is quite straightforward. Here, I need to backup only some sparse files and directories which are spread out in the directory tree. Say, some configuration files, like /etc/ssh/sshd_config, /etc/fail2ban/jail.local, and the /var/www/, ~/.local/bin/ and ~/...
nightcod3r
1

votes
1

answer
33

Views

In hg how do I pull all remotes/paths in one command?

I'm looking for the equivalent of git fetch --all. I currently have three different remote paths configured for my repository. hg paths shows all three. How do I do hg pull --all to fetch the new change sets from all remote repositories?
Evan
1

votes
0

answer
24

Views

Hg acl extension: prevent push based on branch and file name

Using the ACL extension of hg, I managed to prevent users to push on some branches (see [acl.deny.branches]) or some files (see [acl.deny], [acl.allow]). However I would like to be able to mix both control. Here is an example: we have two users, alice and bob the repo is made of two files A and B we...
Vinz
1

votes
1

answer
36

Views

Keeps track of files in eclipse, who made changes on which branch

Keeps track of files in eclipse, who made changes on which branch Hello Guys, I am using BitBucket for project management, and i Create different branches as per features. Multiple teams works on their own branches and some time multiple teams make changes in same file. So at the time of release I...
Dupinder Singh
1

votes
1

answer
224

Views

How to get rid of this Mercurial warning? (hostsecurity/hostfingerprints)

Since I moved to Ubuntu 18.04 with Mercurial 4.5.3, I am seeing the following warning: (SHA-1 fingerprint for bitbucket.org found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [host...
0xC0000022L
1

votes
0

answer
32

Views

Preventing changesets with files matching .hgignore patterns from being pushed to an hg repo

How can I prevent changesets (from the source repo) with files matching .hgignore patterns (in the head of each respective target branch in the target repo) from being pushed to an hg repo? It looks like the ACL Extension can deny pushes based on file name globs, but I prefer to keep [acl.deny] in h...
XDR
1

votes
0

answer
47

Views

Sharing .hg/hgrc settings across all clones

Is there any way to easily share .hg/hgrc settings across all clones of a Mercurial repo? e.g., I want to automatically enable the commitsigs extension for all clones of a repo (obviously, I'd include a copy of commitsigs.py in the repo). If I make other settings changes over time, I want them all...
XDR
1

votes
0

answer
31

Views

Include relative paths in .hgignore

How can I have one .hgignore file include another .hgignore file by using a relative path? The include methodology that I know (include:) requires to be rooted. e.g., If I have the following files: .hgignore hgignore/all.hgignore hgignore/eclipse.hgignore hgignore/idea.hgignore e.g., the following...
XDR
1

votes
1

answer
321

Views

tortoisehg workbench on windows 10 not opening

I downloaded the tortoisehg app from the official site here and that is 4.6.1 and when I click on the tortoishg workbench and it's not opening and no error shown, and when I even try to clone with command line I get this error adding changesets adding manifests adding file changes transaction abort...
Abdallah Gaber
1

votes
0

answer
20

Views

Pushing Mercurial commit to sourceforge with Netbeans

I've been using mercurial for my project on Sourceforge for a number of years just fine, but I've never been able to get a commit to push from inside of NetBeans. To write to the repo, sourceforge requires the url be formatted as (in my case) https://[email protected]/p/soundboard/2.0.x but N...
tambascot
1

votes
0

answer
37

Views

Repair a hg repo with broken origin?

Not sure how I did it, but I broke my mercurial repo at rev 0... checking files WeberVent/Inc/[email protected]: 76907c5d3471 not in manifests WeberVent/Inc/[email protected]: unpacking 76907c5d3471: revlog decompress error: Error -3 while decompressing data: incorrect data check WeberVent/Inc/stm32f0...
Thor Johnson
1

votes
0

answer
25

Views

How to configure Notify extension in mercurial

I have seen many posts which are not helping. I can see that hook is getting called but not able to see any output in the output log when I set Test='True' I followed many posts mentioning to make changes in hgrc file, but I'm wondering how changing my local hgrc file affects all other users. I supp...
Vinay
1

votes
1

answer
42

Views

How can I undo a hg push

Basically what has happened is this: I moved a bunch of files from one directory to another directory. I then committed my change and pushed it. Then I notice that my 'move' actually wasn't a move but Mercurial, I guess, actually copied the files I wanted to move and pasted them in the new director...
idkwat2do
1

votes
0

answer
25

Views

How to ascertain if a mercurial patch is already applied

I am using mercurial queues to apply patches. I have the .patch files and series file. I copy those into .hg/patches directory. Then I run the following: hg qpush -all Now, say patch A fails. I investigate and find that patch A was already applied. So I remove patch A from the series file and do the...
Murtaza Raja
1

votes
0

answer
41

Views

Is hg clone --chunked a valid statement?

I have downloaded the required kiln extensions for --chunked to work. hg push --chuncked works but not hg clone --chunked I was just curious if the below statement is valid? hg clone --chunked [Source URL] [Destination URL]
kavya M
1

votes
0

answer
39

Views

diff unexpectedly shows all lines have been modified - but they haven't

I made one little change (removed some trailing whitespaces) then I ran hg diff [File Name], and it says all lines are modified. I had this problem before then it was fixed somehow then it's back again. I didn't upgrade mercurial or anything. Did anyone experience something like this and managed to...
S. Mark
1

votes
0

answer
15

Views

How to get the incoming changes from a remote Mercurial repository with javahg?

I'm trying to write a sample program that uses javahg to get information on a project repository. I'm running on a Windows client and the remote repository is on a Linux Server. However, when I try to get the incoming changes, it hangs or it gives me a null bundle as a result. class Mercurial { sta...
David Obber
1

votes
0

answer
50

Views

Is there any way we can pass the Hg credentials to gradle release plugin

I am trying to pass the user credentials so this can commit/push the changes back to Mercurial(Hg).I know they mentioned it for SVN but not for Hg. Is there any way we can achieve this for Hg as well? apply plugin: 'net.researchgate.release' release { failOnCommitNeeded = false failOnPublishNeeded =...
Sushant
1

votes
1

answer
48

Views

Push Mercurial subrepo to the same path as its parent

Is there any way to configure Mercurial to push a subrepository to the same path specified when pushing its parent? Say we have a parent repo with a subrepo, and the subrepo also has its own subrepo: A - B - - C Now, in each of A, B, and C we have alternate paths specified: A .hg/hgrc [paths] defaul...
Jordan Bondo
1

votes
0

answer
58

Views

Build fails because repo pull fails with repository exists or timeout waiting for lock

Summary I've got a build in TeamCity using Mercurial as the VCS and it's repeatedly failing for one of these two reasons: hg init - repository already exists, except I deleted the whole directory before this so it definitely didn't exist. hg pull - timed out waiting for lock, but the lock it's w...
Nanhydrin
1

votes
0

answer
27

Views

Mercurial config: merge-patterns working on `hg update`

In my .hgrc I have this merge pattern defined: [merge-patterns] public_html/** =internal:other When i run hg merge the mergetool still tries to merge al the (generated) files under public_html, which causes to crash my difftool and causes a whole lot of other merge problems. When I fix those probl...
Terrabythia
1

votes
0

answer
36

Views

How can find “roots” of named branches in mercurial?

I use the following every week or so to create a new branch named foobar that is branched from my current working directory, which could be any named branch. Let's say I do this for a year. I will have several branches name 'foobar' that was created from many different branches and the commit tex...
WhiskerBiscuit
1

votes
0

answer
26

Views

precommit hook returns list of checked marked files in tortoiseHg

precommit hook returns list of checked marked files in tortoiseHg So Basically i am writing a pre-commit hook which, will static analysis the code and give me HTML output of error report. What I had done: I am done with Get a list MODIFIED and ADDED files and run static code analyzer on it. get Resu...
Dupinder Singh
1

votes
1

answer
34

Views

mercurial extensions: efficient templatekeyword implementation

I'm writing a mercurial extension, but am finding that template rendering is rather slow. I was originally using cmdutil.rendertemplate(), however, it seems that has to reparse the template string every time, which is rather slow. When switching to the 'new' api for @templatekeyword, it looks like t...
Richard Levasseur
1

votes
1

answer
69

Views

Bobthefish no longer displaying correctly for Mercurial (works fine for git)

I'm new to Mac (macos High Sierra) and have just discovered fish, Oh My Fish, and especially the bobthefish theme. It worked perfectly with Mercurial after I installed it but after a single reboot now I've lost all the colours, indication of source control status etc... It still works with git (whic...
Hadden Uff
1

votes
0

answer
45

Views

Is it possible to write a Mercurial to extend standard commands?

I have been looking into writing an extension for Mercurial and have found this documentation. From what I can see, you can create new commands within the Mercurial environment but what I was hoping to achieve however, was to override an existing command like the commit command. My override would...
Toby Smith
1

votes
1

answer
46

Views

Is it ok to delete .hg/store/data/{corrupted-file}.i. from remote mercurial repository

We are unable to pull or push due to integrity error on a file. one possible solution is to reclone it but this means, all developers and teamcity have to re-clone this repository. Can I not just delete that file from repository directly.
sam
1

votes
1

answer
66

Views

If you “hg clone” an earlier commit, and then commit, will you create a new branch?

I know that when you update to a previous revision, you create a new branch on your next commit. What happens when you clone an earlier revision? Will your next commit (or push) create a new branch? The reason I ask is because our Tip is currently broken, so until it gets fixed, I was planning to do...
ktm5124
1

votes
0

answer
58

Views

One Bitbucket/Mercurial repository using SSH. Now can't push/pull in others

I'm using Mercurial with TortoiseHg 2.2. I have about a dozen registered repositories and I have remote repositories for most of them at Bitbucket. I recently had to change one repository to use SSH (in order to deal with a very large file). Now I'm finding that I can't push to or pull from any of...
Tamar E. Granor
1

votes
0

answer
22

Views

hg export-like output with all changesets between two revisions collapsed into one?

So, there is a project that I forked, and then I worked on it in my own branch, and pushed to my own fork. So let's say the last/tip of the original project was revision 5000; when I started working in my branch I made revision 5001, and now at the end, my branch tip is at revision 5050. Now, if I u...
sdaau
1

votes
1

answer
23

Views

Jenkins not detecting Mercurial repository

I'm currently trying to setup a new CI/CD system based on Ubuntu 14.04 using Jenkins and Mecurial as my SCM. (Tortoisehg ui) I've been through this all before using Windows which was pretty straight forward however i'm getting a bit stuck with getting Jenkins to recognise my repositories. I've tried...
Will

View additional questions