hg-git with git pull request

[Nathan Goldbaum]

Do you happen to have the following in your .hgrc?

[git]
intree = True

That will make it so the local git clone is in .git instead of .hg/git.

-Nathan

On Wed, Apr 19, 2017 at 1:03 PM, Neal Becker <ndbecker2 at gmail.com> wrote:

> I did update using hg-git repo:
> default = https://bitbucket.org/durin42/hg-git
>
> Installed using python setup.py install --user
> Made sure to remove OS-installed version of hg-git.
>
> Tried hg clone again.  Same result, there is no git dir under .hg.
>
>
> On Wed, Apr 19, 2017 at 1:51 PM Nathan Goldbaum <nathan12343 at gmail.com>
> wrote:
>
>> Can you try using a checkout of the hg-git repo? I think a release is
>> long overdue.
>>
>>
>> On Wed, Apr 19, 2017 at 12:48 PM Neal Becker <ndbecker2 at gmail.com> wrote:
>>
>>> strange, I just made sure I have updated hg_git to 0.8.6, but I can't
>>> reproduce your result.
>>>
>>> hg clone git://github.com/QuantStack/xtensor.git
>>> There is no xtensor/.hg/git.  There is:
>>> /home/nbecker/tmp/xtensor/.hg:
>>>   total used in directory 104 available 176674528
>>>   drwxrwxr-x. 1 nbecker nbecker   282 Apr 19 13:41 .
>>>   drwxrwxr-x. 1 nbecker nbecker   340 Apr 19 13:41 ..
>>>   -rw-rw-r--. 1 nbecker nbecker    57 Apr 19 13:40 00changelog.i
>>>   -rw-rw-r--. 1 nbecker nbecker    48 Apr 19 13:41 bookmarks
>>>   -rw-rw-r--. 1 nbecker nbecker     6 Apr 19 13:41 bookmarks.current
>>>   -rw-rw-r--. 1 nbecker nbecker     8 Apr 19 13:41 branch
>>>   drwxrwxr-x. 1 nbecker nbecker   124 Apr 19 13:41 cache
>>>   -rw-rw-r--. 1 nbecker nbecker  8168 Apr 19 13:42 dirstate
>>>   -rw-rw-r--. 1 nbecker nbecker 54120 Apr 19 13:41 git-mapfile
>>>   -rw-rw-r--. 1 nbecker nbecker   987 Apr 19 13:41 git-tags
>>>   -rw-rw-r--. 1 nbecker nbecker   500 Apr 19 13:41 hgrc
>>>   -rw-rw-r--. 1 nbecker nbecker    46 Apr 19 13:40 requires
>>>   drwxrwxr-x. 1 nbecker nbecker   224 Apr 19 13:41 store
>>>   -rw-rw-r--. 1 nbecker nbecker     0 Apr 19 13:41 undo.bookmarks
>>>   -rw-rw-r--. 1 nbecker nbecker     7 Apr 19 13:41 undo.branch
>>>   -rw-rw-r--. 1 nbecker nbecker    16 Apr 19 13:41 undo.desc
>>>   -rw-rw-r--. 1 nbecker nbecker    40 Apr 19 13:41 undo.dirstate
>>>
>>> On Wed, Apr 19, 2017 at 12:27 PM Nathan Goldbaum <nathan12343 at gmail.com>
>>> wrote:
>>>
>>>> This seems to work:
>>>>
>>>> hg clone git://github.com/QuantStack/xtensor.git
>>>> cd xtensor/.hg/git
>>>> git fetch https://github.com/QuantStack/xtensor
>>>> <https://github.com/QuantStack/xtensor.git> pull/269/head:dynamic_view
>>>> cd ../../
>>>> hg gimport
>>>> hg update dynamic_view
>>>>
>>>> On Wed, Apr 19, 2017 at 10:55 AM, Neal Becker <ndbecker2 at gmail.com>
>>>> wrote:
>>>>
>>>>> Nathan Goldbaum wrote:
>>>>>
>>>>> > You should be able to do "hg clone
>>>>> > git://github.com/QuantStack/xtensor.git".
>>>>> >
>>>>> > On Wed, Apr 19, 2017 at 10:48 AM, Neal Becker <ndbecker2 at gmail.com>
>>>>> wrote:
>>>>> >
>>>>> >> I'm maintaining a local copy of a github repo, to which I've locally
>>>>> >> added a
>>>>> >> PR.  So I create this by:
>>>>> >>
>>>>> >> git clone https://github.com/QuantStack/xtensor.git
>>>>> >> git fetch origin pull/269/head:dynamic_view
>>>>> >>
>>>>> >> Now I can hg clone this local repo.
>>>>> >>
>>>>> >> But can I create the hg copy directly from github, without the
>>>>> extra step
>>>>> >> of
>>>>> >> cloning the git local copy and then adding the PR?
>>>>> >>
>>>>> >> I hope I'm making sense, I don't know much about git or github.
>>>>> >>
>>>>> >> _______________________________________________
>>>>> >> Mercurial mailing list
>>>>> >> Mercurial at mercurial-scm.org
>>>>> >> https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>>>> >>
>>>>>
>>>>> If all I do is
>>>>> git clone https://github.com/QuantStack/xtensor.git
>>>>>
>>>>> Then
>>>>> hg clone xtensor xtensor.hg
>>>>>
>>>>> I don't see the PR (dynamic_view) in the hg clone.
>>>>> I seem to need to do:
>>>>> git fetch origin pull/269/head:dynamic_view
>>>>>
>>>>> And I don't know a way to do this directly with hg.
>>>>>
>>>> _______________________________________________
>>>>> Mercurial mailing list
>>>>> Mercurial at mercurial-scm.org
>>>>> https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>>>>
>>>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20170419/fa9be4ab/attachment-0002.html>