repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-stash: do not remove a ref by hand.
2007-05-15
Simo
n
Hausmann
Fix git-p4 cl
o
ne //depot/project (he
a
d
i
mport)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Converted to uni
x
n
ewl
i
nes
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausman
n
Make submit
t
ing work o
n
Wi
n
dows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon
Hausmann
M
ake s
u
re all
popen calls
u
se binary
m
ode (for
W
indows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hau
s
mann
Ad
d
ed a little
.
bat
w
rapper from Mariu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausman
n
Use the subprocess module instead
o
f
p
open
2
to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Sim
o
n Hausmann
Docum
e
nt some
implementation details, for the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
C
leanup, re
m
oved the old
t
agging c
o
d
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
usmann
clea
n
u
p,
r
en
a
m
ed self
.
g
lobalP
r
e
fix to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausman
n
Mic
r
o cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hau
s
mann
Handle
patch errors in git-p
4
submit b
e
tt
e
r
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imon Hausmann
A new attem
p
t at f
i
xi
n
g the ch
i
ld-fast-
i
mport-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hau
s
mann
Slightly improve
d
fo
r
matti
n
g o
f
the ra
w
_in
p
ut qu
e
stions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Ha
u
sm
a
nn
Removed the old pa
t
ch ap
p
ly cod
e
f
r
om git-p4 su
b
m
i
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausman
n
Fix th
e
t
i
mezone for
m
atting
.
No
w
qgit also disp
l
ays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Pr
i
n
t
an erro
r
messa
g
e
o
f some sort
if git fast
-
im
p
or
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
i
mon
Haus
m
ann
Allow for convenient
r
ebasing after
g
i
t-p
4
su
b
mit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
Adde
d
a simple example of
usage to the "documentat
i
on" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausmann
fix v
a
r
i
able usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
F
i
x file determi
n
ation for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
A
d
ded git-p4 clone c
o
nvenience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
Hon
o
r --silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Turn o
f
f potentially slow label detection by d
e
f
a
ult
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n
H
a
usmann
Provide a tree s
u
mmary
after git-p4 r
e
base
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
A
dd
e
d g
i
t-p4 rebase conven
i
ence
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
i
mon Hausmann
Clean up pytho
n
class na
m
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "compilation"
:)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Ha
u
sm
a
nn
Fix t
h
e docs for git-p4 submi
t
and turn git-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausm
a
nn
F
i
x variable usage in t
a
g impo
r
t
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
m
a
nn
Added support
for mapping p4 labels to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Haus
m
ann
git-p4 deb
u
g
doesn't need
a
g
i
t re
p
ository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simo
n
H
a
u
smann
D
on't try
to
pa
r
se
a
n
y options wit
h
gi
t
-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausma
n
n
Pref
e
r git c
o
mmand
o
ver git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n
H
a
u
smann
Minor cosmetic f
i
xlet for the git-p4 submit
sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Different versions of
p
4 have di
f
ferent out
p
ut for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simo
n
Hausman
n
Use t
h
e
new increm
e
ntal import styl
e
by def
a
ult
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
i
mon Hausm
a
nn
Mak
e
it possible to
r
u
n git-p4 subm
i
t f
r
om wit
h
in the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Br
a
nd
new
sm
a
rt
incre
m
ental
i
mport
that doesn't ne
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Set t
h
e d
e
fa
u
lt branch in ru
n
, not in
t
he constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
He
l
p
e
r functi
o
n to check the
e
x
istance of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Adde
d
some hel
p
e
r
function(s) to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausm
a
nn
Chan
g
ed the default
branch
f
or imports from "mas
t
er
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Cha
n
ged t
h
e format
of th
e
imported log me
s
sage slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Re
m
oved the
.
py ext
e
nsion from git-
p
4 as it's a
n
noyi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausma
n
n
Don't sho
w
the submi
t
template
a
nd the diff firs
t
in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Make it possible to in
v
oke git-p4 fro
m
within sub
d
irec
t
o
ries
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
M
ade
--apply-
a
s-patc
h
the default f
o
r
git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
s
ma
n
n
Fix support for deletions in git-p
4
s
u
bm
i
t when
using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Added ex
p
erimental but supe
r
-fast --ap
p
l
y
-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
mann
Documentatio
n
enh
a
n
cem
e
nts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
Start o
f
the
g
it-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
Removed p4-fast-export and
p4-
g
i
t-sy
n
c
a
s they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed the initial vers
i
on import by g
e
tting
t
he file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
A
dded
missing "self"s to make the
s
c
ript eval
u
a
te correctl
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
Completely
u
ntest
e
d "merge" of p4-fast-export
.
p
y
int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
syn
c
-to-perforce is now called submit and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hau
s
mann
Part of the cod
e
is cop
y
r
ight by
Trolltec
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
First (untested) atte
m
pt at
migrating p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausman
n
P
r
ovide a li
t
t
le bit of he
l
p descr
i
ption fo
r
the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Haus
m
ann
Start moving the git
-
p4 tools into one
s
i
n
gle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
P
a
ss the
right number of argument
s
to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
smann
Impro
v
ed
t
he git dir detect
i
on
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Haus
m
ann
Default to int
e
r
a
ctive s
y
ncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
imon Hausmann
Use
p4 revert
.
.
.
inste
a
d of revert -a
.
.
.
afte
r
submi
t
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
a
us
m
a
nn
Auto-d
e
tect the current git branch b
e
fore
su
b
m
i
t
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
Hausmann
I
g
nore
A
pple resource files when importing f
r
o
m perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usmann
Be nice and use /usr/bin/env python
for the git
-
p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Aut
o
matically
op
e
rate on a te
m
porary branc
h
, n
e
ed
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausm
a
nn
Lots
o
f
bugfixes to
p
4
-
git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
imon Hau
s
mann
Fix git
-
dir option and
allow reading
log s
u
bstitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
i
m
o
n Hausmann
First version of
a new
s
cript to
submit change
s
bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
H
a
usm
a
nn
Split up the cache commandline options into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Redu
c
e the number of
f
al
s
e
"
merges" by
s
k
ippin
g
"
b
ranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
au
s
mann
M
ore
w
ork on branch detec
t
i
o
n
by imple
m
enting
chan
g
eIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Mo
r
e code cleanups and pre
p
arations for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Ha
u
smann
Minor
c
ode cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
ake t
h
e p4 data/command cache configurable t
h
rough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausm
a
nn
Fixe
d
p4-debug
f
ile exten
s
ion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
im
o
n Hausma
n
n
C
h
a
n
ged --kn
o
w
n
-
branches to take
a
file a
s
argumen
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon H
a
usmann
Work i
n
progress on de
t
ecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon Hau
s
mann
A
d
jus
t
th
e
ou
t
put
p
arsing of git name-
r
ev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't print a
p
lain ne
w
line at the en
d
of the exe
c
uti
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
Mo
r
e wor
k
in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausma
n
n
Added su
p
po
r
t
for --sile
n
t
so th
a
t p4-fast-expor
t
can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
mon Hausmann
Added p4 delete behavi
o
ural emulation as todo it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausmann
Fix single-branch impo
r
t
s by
s
k
i
p
ping th
e
bra
n
c
h/
m
e
rge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
i
mon Ha
u
smann
Use sets
.
S
et() instea
d
of se
t
() to r
u
n
a
lso wi
t
h older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
i
m
o
n
Hausmann
Make it possible to
specify
t
h
e
p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausman
n
When
t
rying to map p4 integr
a
tions to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
Set g
i
t fas
t
-import m
a
rks for
e
very
imported c
h
ange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
After marking a p4 bran
c
h as merged don't ev
e
r
m
erge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
More
f
ixes in heuri
s
tic p4 bra
n
ch
d
etection
b
ased on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hau
s
mann
Started work on
p
4
br
a
nch detection
(
e
xperimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Hausmann
C
o
de cle
a
n
ups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausman
n
Cleanups, re
m
ove unuse
d
variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
C
r
eate light
w
ei
g
ht git tags (using
t
he "re
s
e
t" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausmann
Added a little
h
elpe
r
script to remove unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Change
d
the default git import bra
n
c
h fro
m
"p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Hausmann
Avo
i
d the exc
e
ssive use of git tags
f
o
r every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next