Pulling changes from another Git repo to the one cloned

[Danny Tuppeny]

I managed to get hg-git up and running, and cloned (and pushed changes to) a fork on GitHub.

My changes were pulled back into the main repo, along with some other changes.

Now I need to update my fork to match the original repo again (note: I cloned my fork, not the original repo).

However, I'm struggling to pull from the original... "hg pull" works, but "hg pull blah" fails. Here's the output:

D:\Documents\Websites\SignalR-Chat>hg pull

pulling from git+ssh://g...@github.com/DanTup/SignalR-Chat.git

["git-upload-pack '/DanTup/SignalR-Chat.git'"]

no changes found

D:\Documents\Websites\SignalR-Chat>hg pull git+ssh://g...@github.com/davidfowl/SignalR-Chat.git

pulling from git+ssh://g...@github.com/davidfowl/SignalR-Chat.git

["git-upload-pack '/davidfowl/SignalR-Chat.git'"]

abort: No module named win32pipe!

Should this work, or do I need to do something else?

Thanks!

Danny

[Danny Tuppeny]

I removed the "git@" and got an even weirder error:

D:\Documents\Websites\SignalR-Chat>hg pull git+ssh://github.com/davidfowl/SignalR-Chat.git

pulling from git+ssh://github.com/davidfowl/SignalR-Chat.git

["git-upload-pack '/davidfowl/SignalR-Chat.git'"]

** unknown exception encountered, details follow

** report bug details to http://mercurial.selenic.com/bts/

** or merc...@selenic.com

** Python 2.6.4 (r264:75708, Oct 26 2009, 08:23:19) [MSC v.1500 32 bit (Intel)]

** Mercurial Distributed SCM (version 1.6)

** Extensions loaded: extdiff, gestalt, kilnauth, kilnpath, svnblame, big-push, nobranch, kiln, rebaseif, bookmarks, hggit

Traceback (most recent call last):

  File "hg", line 27, in <module>

  File "mercurial\dispatch.pyc", line 16, in run

  File "mercurial\dispatch.pyc", line 34, in dispatch

  File "mercurial\dispatch.pyc", line 54, in _runcatch

  File "mercurial\dispatch.pyc", line 483, in _dispatch

  File "mercurial\dispatch.pyc", line 351, in runcommand

  File "mercurial\dispatch.pyc", line 534, in _runcommand

  File "mercurial\dispatch.pyc", line 488, in checkargs

  File "mercurial\dispatch.pyc", line 481, in <lambda>

  File "mercurial\util.pyc", line 420, in check

  File "mercurial\extensions.pyc", line 116, in wrap

  File "mercurial\util.pyc", line 420, in check

  File "hgext\bookmarks.pyc", line 406, in pull

  File "mercurial\util.pyc", line 420, in check

  File "mercurial\extensions.pyc", line 116, in wrap

  File "mercurial\util.pyc", line 420, in check

  File "D:\Documents\Misc Scripts\Mercurial\rebaseif.py", line 79, in pullrebaseif

    orig(ui, repo, *args, **opts)

  File "mercurial\util.pyc", line 420, in check

  File "mercurial\extensions.pyc", line 116, in wrap

  File "mercurial\util.pyc", line 420, in check

  File "C:\Program Files (x86)\Kiln Client\kilnpath.py", line 56, in kilnpath_info

    return orig(ui, repo, dest, **opts)

  File "mercurial\util.pyc", line 420, in check

  File "mercurial\commands.pyc", line 2792, in pull

  File "D:\Programs\HG-Git\hggit\hgrepo.py", line 14, in pull

    return git.fetch(remote.path, heads)

  File "D:\Programs\HG-Git\hggit\git_handler.py", line 149, in fetch

    refs = self.fetch_pack(remote, heads)

  File "D:\Programs\HG-Git\hggit\git_handler.py", line 810, in fetch_pack

    f.write, progress.progress)

  File "C:\Program Files (x86)\Mercurial\library.zip\dulwich\client.py", line 226, in fetch_pack

  File "C:\Program Files (x86)\Mercurial\library.zip\dulwich\client.py", line 98, in _read_refs

  File "C:\Program Files (x86)\Mercurial\library.zip\dulwich\protocol.py", line 147, in read_pkt_seq

  File "C:\Program Files (x86)\Mercurial\library.zip\dulwich\protocol.py", line 104, in read_pkt_line

ValueError: invalid literal for int() with base 16: 'logi'

D:\Documents\Websites\SignalR-Chat>Server refused our key

FATAL ERROR: Disconnected: No supported authentication methods available (server sent: publickey)

[Augie Fackler]

Hm. This looks like either github is violating the git protocol, or
dulwich is. Not sure which it'd be offhand.

> D:\Documents\Websites\SignalR-Chat>Server refused our key
> FATAL ERROR: Disconnected: No supported authentication methods available
> (server sent: publickey)
>
> On 26 September 2011 17:44, Danny Tuppeny <da...@tuppeny.com> wrote:
>>
>> I managed to get hg-git up and running, and cloned (and pushed changes to)
>> a fork on GitHub.
>> My changes were pulled back into the main repo, along with some other
>> changes.
>> Now I need to update my fork to match the original repo again (note: I
>> cloned my fork, not the original repo).
>> However, I'm struggling to pull from the original... "hg pull" works, but
>> "hg pull blah" fails. Here's the output:
>> D:\Documents\Websites\SignalR-Chat>hg pull
>> pulling from git+ssh://g...@github.com/DanTup/SignalR-Chat.git
>> ["git-upload-pack '/DanTup/SignalR-Chat.git'"]
>> no changes found
>> D:\Documents\Websites\SignalR-Chat>hg pull
>> git+ssh://g...@github.com/davidfowl/SignalR-Chat.git
>> pulling from git+ssh://g...@github.com/davidfowl/SignalR-Chat.git
>> ["git-upload-pack '/davidfowl/SignalR-Chat.git'"]
>> abort: No module named win32pipe!
>> Should this work, or do I need to do something else?
>> Thanks!
>> Danny
>

> --
> You received this message because you are subscribed to the Google Groups
> "hg-git" group.
> To post to this group, send email to hg-...@googlegroups.com.
> To unsubscribe from this group, send email to
> hg-git+un...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/hg-git?hl=en.
>

[Danny Tuppeny]

Just my luck :-(

Surprised GitHub won't let me sync a fork up with the main repo online - that'd solve the issue for now!

If there's anything I can do to help track this down, let me know. Now it's (mostly) working, I'm quite liking the idea of not having to learn/install Git ;-)

[Augie Fackler]

This should totally work. Not sure what win32pipe is though.

[Danny Tuppeny]

On 26 September 2011 17:59, Augie Fackler <li...@durin42.com> wrote:

This  should totally work. Not sure what win32pipe is though.

Seemingly a module for using Windows pipes. Not really sure why it would (appear to) be missing :/

http://timgolden.me.uk/pywin32-docs/win32pipe.html

I wonder if it's related to the py2exe version of Mercurial...

If I wasn't using Google App Engine, I'd just upgrade Python and build Mercurial myself, but I suspect it'd result in much GAE breakage :(

[Jimit Ndiaye]

Isn't it possible to pull using git then hg gexport?

[Danny Tuppeny]

On 27 September 2011 11:23, Jimit Ndiaye <jimit...@gmail.com> wrote:

Isn't it possible to pull using git then hg gexport?

I don't have/want git, that's why I'm trying to use hg-git :D

 

[Danny Tuppeny]

I was able to work around this for now, by cloning the original GitHub repo with hg-git, then pulling the changes into my (forked) repo, then pushing back to my GitHub fork repo.

A bit of a pain, but it works, so good enough for me - I don't often work with GitHub :-)

On 26 September 2011 17:59, Augie Fackler <li...@durin42.com> wrote: