Skip to content
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

Jump to bottom

Migrate auto-update to git #6

Closed
andresriancho opened this issue Jan 21, 2013 · 3 comments
Closed

Migrate auto-update to git #6

andresriancho opened this issue Jan 21, 2013 · 3 comments
Assignees
@andresriancho
Milestone
Github migration

Comments

@andresriancho
Copy link
Owner

The current auto-update code looks for updates from Sourceforge's repository using pysvn. Modify the code to make it look for updates in this repo.
@ghost ghost assigned andresriancho Jan 21, 2013
@andresriancho
Copy link
Owner Author

Asked a question at the GitPython mailing list about merge conflicts. Check tomorrow for an answer
https://groups.google.com/forum/?fromgroups#!forum/git-python

andresriancho added a commit that referenced this issue Jan 30, 2013
@andresriancho
Initial work on issue #6 , still more to do on this since I don't kno…
ee6a866 
…w how to handle these issues:

 * Merge conflicts
 * Revisions in SVN were represented as int, so it was easier to do things like max(rev1, rev2) and easier for the user to understand that he was updating from revision 123 to 125 instead from long_hash1 to long_hash2
@andresriancho
Copy link
Owner Author

All working but the following:

  • update() is slow and makes the GUI unresponsive

  • changelog doesn't show on the summary window

  • need to be able to pull() to a specific revision: only available with the console WONTFIX.

  • need unittesting for fetch and pull, create a new (local) repo for testing? WONTFIX: was useful only if I wanted to support moving to a specific commit, but I won't re-test that PythonGit's fetch() and pull() work as expected since I'm calling them without any strange parameters and they already have unittests for their core.

  • need to detect merge conflicts (see answer on mailing list) and reset() to a previous revision

    Pending work for the next milestone: Update report shows None as date for commit before update #98

andresriancho added a commit that referenced this issue Jan 31, 2013
@andresriancho
Exploring GUI auto-update for issue #6, also thinking about giving th…
2d586c5 
…e user more feedback on fetch() and pull()
andresriancho added a commit that referenced this issue Jan 31, 2013
@andresriancho
Improvements for GUI feedback and for stopping window from getting un…
ef9ec05 
…responsive (part of issue #6)
andresriancho added a commit that referenced this issue Jan 31, 2013
@andresriancho
Finished GUI unresponsiveness issue in auto-update
e0a6103 
Issue #6
andresriancho added a commit that referenced this issue Jan 31, 2013
@andresriancho
Removed the useless feature of moving to a specific commit. Only adva…
c29eb9d 
…nced users will do that and the auto-update feature is targeted for novice users. Advanced users can use git command to move around between versions.

Issue #6
andresriancho added a commit that referenced this issue Feb 1, 2013
@andresriancho
Initial version of merge error handling for issue #6
06404e7
@andresriancho
Copy link
Owner Author

Tested reset()
Tested repo_has_conflicts() using [0]

[0] https://raw.github.com/phluks/create-git-conflict.sh/master/create-git-conflict.sh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@andresriancho andresriancho

Labels
None yet
Projects
None yet
Milestone
Github migration
Development

No branches or pull requests
1 participant
@andresriancho