Skip to content

Added translation for 'hg outgoing' to git #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spookylukey wants to merge 4 commits into
base: master
Choose a base branch
from
+7 −1
Open

Added translation for 'hg outgoing' to git #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de5e4d1
Added translation of 'hg record' to git.
spookylukey Jan 22, 2011
61eb341
Merge branch 'master' of https://github.com/alex/vcs-translator
spookylukey Jan 22, 2011
8e38927
Merge branch 'master' of https://github.com/alex/vcs-translator
spookylukey Feb 19, 2011
8cf53ae
Added translation for 'hg outgoing'
spookylukey Feb 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions vcstranslator_project/apps/translator/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def test_hg_to_git(self):
self.assert_translates(t, "record", "git add -p && git commit")
self.assert_translates(t, "log", "git log --all")
self.assert_translates(t, "", "git")
self.assert_translates(t, "outgoing", "git log origin..HEAD")

def test_git_to_hg(self):
t = Translator("git", "hg")
Expand Down
7 changes: 6 additions & 1 deletion vcstranslator_project/apps/translator/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def translate_status(self, command):
return "git status"

def translate_log(self, command):
if command.outgoing:
return "git log origin..HEAD"
if command.files is not command.ALL or command.branches is not command.ALL:
return
return "git log --all"
Expand Down Expand Up @@ -163,6 +165,8 @@ def parse(self, command):
return Status()
elif parts == ["log"]:
return Log(branches=Log.ALL, files=Log.ALL)
elif parts == ["outgoing"]:
return Log(branches=Log.ALL, files=Log.ALL, outgoing=True)
elif parts[0] == "revert" and len(parts) == 2:
return Revert(files=[SomeFile(parts[1])])

Expand Down Expand Up @@ -360,9 +364,10 @@ def __init__(self, verbose):
self.verbose = verbose

class Log(Command):
def __init__(self, branches, files):
def __init__(self, branches, files, outgoing=False):
self.branches = branches
self.files = files
self.outgoing = outgoing

class Help(Command):
def __init__(self, useless=False):
Expand Down