[sage-devel] Re: git diff branch1..develop

2014-05-04 Thread Ralf Stephan
On Friday, May 2, 2014 12:07:35 AM UTC+2, Volker Braun wrote:

 Trac password or ssh password for the git authentication? You shouldn't 
 need a trac password (though I probably don't test that), but you need a 
 ssh key unless you follow the Readonly repository instructions.


I just installed a new sage directory locally with git-trac. I have an 
ssh-key uploaded to trac and working (tested in a previous installation). I 
git-trac checkout a ticket, commit, and git-trac push.
git remote -v says:

tracssh://g...@trac.sagemath.org/sage.git (fetch)
tracssh://g...@trac.sagemath.org/sage.git (push)
$~/sage git trac push
Pushing to Trac #16023...
Use git trac config --user=name to set your trac username
Exiting.
$~/sage git trac config --user=rws
Saved trac username.
Trac xmlrpc URL:
http://trac.sagemath.org/xmlrpc (anonymous)
http://trac.sagemath.org/login/xmlrpc (authenticated)
realm sage.math.washington.edu
Username: rws
Use git trac config --pass=secret to set your trac password
Exiting.

Unfortunately the only copy of the password was not backed up, so either 
git-trac will have to change its behaviour or I must ask you to send me a 
new password (because I need the old to set a new one, and there's no 
Forgot Password button on trac). That new password might suffer the same 
fate though.

Can you please help?

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-04 Thread Volker Braun
I'll do the password reset

On Sunday, May 4, 2014 9:57:20 AM UTC+2, Ralf Stephan wrote:

 On Friday, May 2, 2014 12:07:35 AM UTC+2, Volker Braun wrote:

 Trac password or ssh password for the git authentication? You shouldn't 
 need a trac password (though I probably don't test that), but you need a 
 ssh key unless you follow the Readonly repository instructions.


 I just installed a new sage directory locally with git-trac. I have an 
 ssh-key uploaded to trac and working (tested in a previous installation). I 
 git-trac checkout a ticket, commit, and git-trac push.
 git remote -v says:

 tracssh://g...@trac.sagemath.org/sage.git (fetch)
 tracssh://g...@trac.sagemath.org/sage.git (push)
 $~/sage git trac push
 Pushing to Trac #16023...
 Use git trac config --user=name to set your trac username
 Exiting.
 $~/sage git trac config --user=rws
 Saved trac username.
 Trac xmlrpc URL:
 http://trac.sagemath.org/xmlrpc (anonymous)
 http://trac.sagemath.org/login/xmlrpc (authenticated)
 realm sage.math.washington.edu
 Username: rws
 Use git trac config --pass=secret to set your trac password
 Exiting.

 Unfortunately the only copy of the password was not backed up, so either 
 git-trac will have to change its behaviour or I must ask you to send me a 
 new password (because I need the old to set a new one, and there's no 
 Forgot Password button on trac). That new password might suffer the same 
 fate though.

 Can you please help?


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-02 Thread Simon King
Hi Erik,

On 2014-05-01, Erik Massop e.mas...@hccnet.nl wrote:
 Yes. I understand that it tells me how to configure stuff so that I can
 *only* pull (and this without password), but can not push (even with
 password).

 I don't see why I would be impossible to use read-only for fetching and
 ssh-key for pushing. In fact, with git = 1.6.4 (needed according to
 [1]) and with this in my .git/config:

 [remote trac]
   pushurl = g...@trac.sagemath.org:sage.git
   url = git://trac.sagemath.org/sage.git
   fetch = +refs/heads/*:refs/remotes/trac/*

 which yields this from git remote -v:

 origingit://github.com/sagemath/sage.git (fetch)
 origingit://github.com/sagemath/sage.git (push)
 trac  git://trac.sagemath.org/sage.git (fetch)
 trac  g...@trac.sagemath.org:sage.git (push)

Great, so it *can* be mixed. Perhaps it should be stated in the
developer guide accordingly.

Thank you,
Simon


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
If you click on the branch name (not the Commits) on trac then it'll show 
you just the cumulative diff against the current develop branch. It 
actually does the merge and then the diff from the merge, which is a bit 
more useful than just git diff my_branch...develop.

If you want to do it offline this is also implemented as git trac review 
in the git-trac script.



On Thursday, May 1, 2014 12:00:02 PM UTC+1, Martin Albrecht wrote:

 Hi all, 

 currently it is a bit awkward to review a branch on trac which has many 
 commits. For example 

http://trac.sagemath.org/ticket/15976 

 has quite a few commits so it seems quite daunting to review it, whereas 
 the 
 actual difference to the main development branch is not that much. 
 Locally, we 
 can do: 

 $ git diff my_branch..develop 

 and 

 $ git diff my_branch...develop 

 cf. 
 https://stackoverflow.com/questions/9834689/comparing-two-branches-in-git 

 Could something like this be added to trac? 

 Cheers, 
 Martin

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Simon King
Hi Volker,

On 2014-05-01, Volker Braun vbraun.n...@gmail.com wrote:
 If you want to do it offline this is also implemented as git trac review 
 in the git-trac script.

What does one need to do to get the git-trac script, and where is it
documented?

Cheers,
Simon


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread John Cremona
On 1 May 2014 12:08, Volker Braun vbraun.n...@gmail.com wrote:
 If you click on the branch name (not the Commits) on trac then it'll show
 you just the cumulative diff against the current develop branch. It actually
 does the merge and then the diff from the merge, which is a bit more useful
 than just git diff my_branch...develop.


When I do that I see the list of about 15 commits with commit messages
but not the diffs.   I can clisck on any of these commits and see the
diffs for that commit, but how do I see the cumulative diffs for the
sequence of commits (in trac)?

John

 If you want to do it offline this is also implemented as git trac review
 in the git-trac script.







 On Thursday, May 1, 2014 12:00:02 PM UTC+1, Martin Albrecht wrote:

 Hi all,

 currently it is a bit awkward to review a branch on trac which has many
 commits. For example

http://trac.sagemath.org/ticket/15976

 has quite a few commits so it seems quite daunting to review it, whereas
 the
 actual difference to the main development branch is not that much.
 Locally, we
 can do:

 $ git diff my_branch..develop

 and

 $ git diff my_branch...develop

 cf.
 https://stackoverflow.com/questions/9834689/comparing-two-branches-in-git

 Could something like this be added to trac?

 Cheers,
 Martin

 --
 You received this message because you are subscribed to the Google Groups
 sage-devel group.
 To unsubscribe from this group and stop receiving emails from it, send an
 email to sage-devel+unsubscr...@googlegroups.com.
 To post to this group, send email to sage-devel@googlegroups.com.
 Visit this group at http://groups.google.com/group/sage-devel.
 For more options, visit https://groups.google.com/d/optout.

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
Ok, let me try again. If you go to http://trac.sagemath.org/ticket/15976 
the ticket says:

Branch:public/ticket/15976 (Commits)

If you click on public/ticket/15976 then you see the cumulative diff

If you click on (Commits) you'll see the individual commits.


On Thursday, May 1, 2014 12:32:57 PM UTC+1, John Cremona wrote:

 When I do that I see the list of about 15 commits with commit messages 
 but not the diffs.   I can clisck on any of these commits and see the 
 diffs for that commit, but how do I see the cumulative diffs for the 
 sequence of commits (in trac)? 



-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread John Cremona
On 1 May 2014 12:37, Volker Braun vbraun.n...@gmail.com wrote:
 Ok, let me try again. If you go to http://trac.sagemath.org/ticket/15976 the
 ticket says:

 Branch:public/ticket/15976 (Commits)

 If you click on public/ticket/15976 then you see the cumulative diff

In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976
(and logged in), the public/ticket/15976 was not a link!  I think I
would have found it otherwise.  But I refeshed the page and now it is
a link,  and displays exactly as you say.  So this is fine, and
exactly what Marti nand I wanted to see; the only mystery is why that
link was unlinked when I first looked at it.

John


 If you click on (Commits) you'll see the individual commits.


 On Thursday, May 1, 2014 12:32:57 PM UTC+1, John Cremona wrote:

 When I do that I see the list of about 15 commits with commit messages
 but not the diffs.   I can clisck on any of these commits and see the
 diffs for that commit, but how do I see the cumulative diffs for the
 sequence of commits (in trac)?

 --
 You received this message because you are subscribed to the Google Groups
 sage-devel group.
 To unsubscribe from this group and stop receiving emails from it, send an
 email to sage-devel+unsubscr...@googlegroups.com.
 To post to this group, send email to sage-devel@googlegroups.com.
 Visit this group at http://groups.google.com/group/sage-devel.
 For more options, visit https://groups.google.com/d/optout.

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
I've seen that occasionally, if you leave a trac window open for a long 
time then sometimes the ticket name is no longer a link. I don't know 
exactly what triggers it, possibly when the ticket is updated by somebody 
else (ajax call?). In any case its easily fixed by reloading the page.



On Thursday, May 1, 2014 1:17:38 PM UTC+1, John Cremona wrote:

 In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976 
 (and logged in), the public/ticket/15976 was not a link! 


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Travis Scrimshaw
That happens when you've started making a comment (or any other change to 
the ticket) as part of the preview.

Best,
Travis


On Thursday, May 1, 2014 6:25:31 AM UTC-7, Volker Braun wrote:

 I've seen that occasionally, if you leave a trac window open for a long 
 time then sometimes the ticket name is no longer a link. I don't know 
 exactly what triggers it, possibly when the ticket is updated by somebody 
 else (ajax call?). In any case its easily fixed by reloading the page.



 On Thursday, May 1, 2014 1:17:38 PM UTC+1, John Cremona wrote:

 In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976 
 (and logged in), the public/ticket/15976 was not a link! 



-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread leif

Travis Scrimshaw wrote:

That happens when you've started making a comment (or any other change
to the ticket) as part of the preview.


Hardly related, but is it intentional that trac meanwhile also colors 
(and even strikes!) trac user names in replies / quotes (depending on or 
according to the /state of the ticket/)?


Just asking...


-leif

--
() The ASCII Ribbon Campaign
/\   Help Cure HTML E-Mail

--
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread R. Andrew Ohana
On Thu, May 1, 2014 at 9:30 AM, leif not.rea...@online.de wrote:

 Travis Scrimshaw wrote:

 That happens when you've started making a comment (or any other change
 to the ticket) as part of the preview.


 Hardly related, but is it intentional that trac meanwhile also colors (and
 even strikes!) trac user names in replies / quotes (depending on or
 according to the /state of the ticket/)?


No, this came about from upgrading our version of trac -- it seemed so
minor that I didn't spend the time investigating it.


 Just asking...


 -leif

 --
 () The ASCII Ribbon Campaign
 /\   Help Cure HTML E-Mail


 --
 You received this message because you are subscribed to the Google Groups
 sage-devel group.
 To unsubscribe from this group and stop receiving emails from it, send an
 email to sage-devel+unsubscr...@googlegroups.com.
 To post to this group, send email to sage-devel@googlegroups.com.
 Visit this group at http://groups.google.com/group/sage-devel.
 For more options, visit https://groups.google.com/d/optout.




-- 
Andrew

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Dima Pasechnik
On 2014-05-01, Simon King simon.k...@uni-jena.de wrote:
 Hi Volker,

 On 2014-05-01, Volker Braun vbraun.n...@gmail.com wrote:
 If you want to do it offline this is also implemented as git trac review 
 in the git-trac script.

 What does one need to do to get the git-trac script, and where is it
 documented?
http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#installing-the-git-trac-command

HTH,
Dima

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Simon King
Hi Dima,

On 2014-05-01, Dima Pasechnik dimp...@gmail.com wrote:
 What does one need to do to get the git-trac script, and where is it
 documented?
 http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#installing-the-git-trac-command

Great, thank you!

I immediately started playing with it, and I wonder: Can I configure
it so that git trac review 12345 shows me the diff in less (or another
pager)? git does use less when I call git log or git diff ..., but
I don't see any hint in ~/.gitconfig why less is used on the log and the
diff but not on trac review.

Cheers,
Simon

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Simon King
Hi!

Next question:

On 2014-05-01, Simon King simon.k...@uni-jena.de wrote:
 I immediately started playing with it, and I wonder: Can I configure
 it so that git trac review 12345 shows me the diff in less (or another
 pager)? git does use less when I call git log or git diff ..., but
 I don't see any hint in ~/.gitconfig why less is used on the log and the
 diff but not on trac review.

Why am I asked for my trac password when I just pull? Shouldn't a
password only be required for pushing, but not for pulling?

Best regards,
Simon


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread leif

Simon King wrote:

Why am I asked for my trac password when I just pull? Shouldn't a
password only be required for pushing, but not for pulling?


Depends on the configured protocol (I think); git://... vs. ssh://git@...


-leif

--
() The ASCII Ribbon Campaign
/\   Help Cure HTML E-Mail

--
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Dima Pasechnik
On 2014-05-01, Simon King simon.k...@uni-jena.de wrote:
 Hi!

 Next question:

 On 2014-05-01, Simon King simon.k...@uni-jena.de wrote:
 I immediately started playing with it, and I wonder: Can I configure
 it so that git trac review 12345 shows me the diff in less (or another
 pager)? git does use less when I call git log or git diff ..., but
 I don't see any hint in ~/.gitconfig why less is used on the log and the
 diff but not on trac review.

 Why am I asked for my trac password when I just pull? Shouldn't a
 password only be required for pushing, but not for pulling?

did you look at
http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly
?

It also seems that you'd only need to do 
git trac config --user USERNAME --pass 'PASSWORD'
once, and it will store the data somewhere...


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
Trac password or ssh password for the git authentication? You shouldn't 
need a trac password (though I probably don't test that), but you need a 
ssh key unless you follow the Readonly repository instructions.



On Thursday, May 1, 2014 10:49:22 PM UTC+1, Simon King wrote:

 Hi! 

 Next question: 

 On 2014-05-01, Simon King simon...@uni-jena.de javascript: wrote: 
  I immediately started playing with it, and I wonder: Can I configure 
  it so that git trac review 12345 shows me the diff in less (or 
 another 
  pager)? git does use less when I call git log or git diff ..., but 
  I don't see any hint in ~/.gitconfig why less is used on the log and the 
  diff but not on trac review. 

 Why am I asked for my trac password when I just pull? Shouldn't a 
 password only be required for pushing, but not for pulling? 

 Best regards, 
 Simon 




-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
On Thursday, May 1, 2014 10:01:36 PM UTC+1, Simon King wrote:

 I immediately started playing with it, and I wonder: Can I configure 
 it so that git trac review 12345 shows me the diff in less (or another 
 pager)? git does use less when I call git log or git diff ..., but 
 I don't see any hint in ~/.gitconfig why less is used on the log and the 
 diff but not on trac review. 


 The script does some merging in a detached head and then switches back to 
your branch before printing the diff. If we want to let git display the 
pager then the repo would have to stay in the detached head until we close 
the pager. Not necessarily a problem, but I thought its safer to switch 
back as soon as possible. You can always do git trac review | less -R

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread leif

Dima Pasechnik wrote:

Why am I asked for my trac password when I just pull? Shouldn't a
password only be required for pushing, but not for pulling?


did you look at
http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly
?

It also seems that you'd only need to do
git trac config --user USERNAME --pass 'PASSWORD'
once, and it will store the data somewhere...


Somewhere...?!

I wouldn't recommend anyone to use that feature; it's IMHO odd it's even 
there.



-leif

--
() The ASCII Ribbon Campaign
/\   Help Cure HTML E-Mail

--
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun
On Thursday, May 1, 2014 11:16:38 PM UTC+1, leif wrote:

 Somewhere...?! 


In .git/config, of course. Basically an alias for git config --local 
trac.username=...

 

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Simon King
Hi Dima,

On 2014-05-01, Dima Pasechnik dimp...@gmail.com wrote:
 did you look at
 http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly
 ?

Yes. I understand that it tells me how to configure stuff so that I can
*only* pull (and this without password), but can not push (even with
password).

Best regards,
Simon

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Dima Pasechnik
On 2014-05-01, leif not.rea...@online.de wrote:
 Dima Pasechnik wrote:
 Why am I asked for my trac password when I just pull? Shouldn't a
 password only be required for pushing, but not for pulling?

 did you look at
 http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly
 ?

 It also seems that you'd only need to do
 git trac config --user USERNAME --pass 'PASSWORD'
 once, and it will store the data somewhere...

 Somewhere...?!
salted, I presume.

Or do you mean to say that you never ever trust your computer so store
your password? Not even in /etc/passwd ?
Then you probably work in MSDOS...  :-)



 I wouldn't recommend anyone to use that feature; it's IMHO odd it's even 
 there.


 -leif

 -- 
 () The ASCII Ribbon Campaign
 /\   Help Cure HTML E-Mail


-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


[sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Volker Braun


 salted, I presume. 


Trac relies on plaintext (well http digest) authentication, so we need the 
plaintext password.

As always, use different passwords for each account ;-)

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.


Re: [sage-devel] Re: git diff branch1..develop

2014-05-01 Thread Erik Massop
Dear list,

On Thu, 1 May 2014 22:21:51 + (UTC)
Simon King simon.k...@uni-jena.de wrote:

 On 2014-05-01, Dima Pasechnik dimp...@gmail.com wrote:
  did you look at
  http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly
  ?
 
 Yes. I understand that it tells me how to configure stuff so that I can
 *only* pull (and this without password), but can not push (even with
 password).

I don't see why I would be impossible to use read-only for fetching and
ssh-key for pushing. In fact, with git = 1.6.4 (needed according to
[1]) and with this in my .git/config:

[remote trac]
pushurl = g...@trac.sagemath.org:sage.git
url = git://trac.sagemath.org/sage.git
fetch = +refs/heads/*:refs/remotes/trac/*

which yields this from git remote -v:

origin  git://github.com/sagemath/sage.git (fetch)
origin  git://github.com/sagemath/sage.git (push)
tracgit://trac.sagemath.org/sage.git (fetch)
tracg...@trac.sagemath.org:sage.git (push)

I can push to trac with my ssh-key-password (the branch I pushed is at
[2]) and fetch from trac without a password. It's a bit too late in the
evening for me to learn git-trac now, so I tried this only with pure
git (git fetch trac and git push trac master:u/emassop/test). I
really don't see why this would interfere with git-trac though.


Regards,

Erik Massop


[1] 
http://technosorcery.net/blog/2011/12/26/how-i-use-different-fetch-and-push-urls-in-git/
[2] http://git.sagemath.org/sage.git/log/?h=u/emassop/test

-- 
You received this message because you are subscribed to the Google Groups 
sage-devel group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.