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
A little todo note before I forget it :), based on a suggestion from Lars.
2007-05-16
Sim
o
n Hau
s
m
ann
A litt
l
e
todo note before I forget it :), based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
u
s
mann
F
i
x calling g
i
t-p4 rebase from
wi
t
hin
a subdirectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausman
n
Give
a better h
i
nt if gi
t
-p
4
subm
i
t fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
u
s
m
a
n
n
Ad
d
ed the possibi
l
i
ty of skipping patches during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usman
n
Make git-p4 work with bare reposit
o
r
ies
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Fix git-p
4
clo
n
e //depot/project
(
head i
m
port)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on H
a
u
smann
Converted to unix newli
n
es
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausmann
Make submitting work on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
m
o
n H
a
us
m
a
n
n
Make sure all p
o
pen calls use bi
n
ary mod
e
(for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
A
d
ded a l
i
t
t
le
.
ba
t
w
r
apper from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hau
s
mann
U
se the
s
ubprocess
mod
u
l
e
ins
t
e
a
d
o
f
popen2 to mak
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon
Hausma
n
n
D
o
c
um
e
n
t
some implem
e
n
t
ation d
e
t
a
i
l
s
, for the c
u
rious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cleanup, remove
d
the old tagging
code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on H
a
usmann
clean
u
p, ren
a
me
d
self
.
g
lobalPrefix to self
.
d
epotP
a
th
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Mi
c
ro cl
e
anup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
u
s
mann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
Hausmann
Handle patch errors in
git-p4 subm
i
t better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
H
ausm
a
nn
A
new attem
p
t at
fixing
t
h
e c
h
i
l
d-fast-import-proce
s
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n
Hausma
n
n
Sligh
t
ly impro
v
ed for
m
a
t
ting of the
r
a
w
_
i
n
p
u
t questi
o
ns
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Removed the old patch apply code from
g
i
t
-
p
4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imo
n
Hausmann
Fix th
e
timezone
formattin
g
.
N
ow qgit
a
ls
o
disp
l
ays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
S
im
o
n Hausma
n
n
Print an error m
e
ssage
of
s
o
me sort if git
fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Sim
o
n Hausmann
Allow for convenient rebasing afte
r
git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on H
a
u
smann
Adde
d
a
s
imple exa
m
ple
of usage to the
"do
c
umentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
f
ix var
i
a
b
le usag
e
(oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausmann
Fix file determination
f
or #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausmann
Added git-p
4
clo
n
e co
n
v
e
ni
e
nce com
m
a
n
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
Honor --
s
ilent for
l
abels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imon
Hausmann
Turn off
potential
l
y slow
labe
l
de
t
ec
t
ion by defau
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hausmann
Provid
e
a
t
ree summary after
g
it-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
aus
m
an
n
Add
e
d git-p4 rebase convenie
n
ce
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausma
n
n
Clean u
p
pytho
n
clas
s
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
F
i
x "compi
l
ation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
F
ix the d
o
cs for git-p4 subm
i
t and t
u
rn gi
t
-
p
4 su
b
mit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Sim
o
n
H
ausm
a
nn
Fix variable usage
in ta
g
import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon H
a
us
m
ann
Add
e
d suppo
r
t for mapping p4
labels
t
o gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
Hausm
a
nn
g
i
t
-
p4 debug doesn't need a git
r
eposito
r
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Ha
u
sm
a
nn
Do
n
't try
to pa
r
s
e any options wi
t
h git-p4 debug
b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hau
s
mann
Prefer git
c
o
mmand over gi
t
-co
m
m
and
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausma
n
n
Minor cosmetic fixlet for the git-p4 su
b
mit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
im
o
n
H
ausmann
D
i
ffere
n
t versions of p
4
have
different outp
u
t for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon
H
au
s
man
n
Use the new incremental import style b
y
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make it p
o
s
s
i
b
le to run g
i
t-p4
s
ubmit from with
i
n the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Brand new smart
i
ncremental im
p
ort that
d
oesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Se
t
the defaul
t
bra
n
ch in ru
n
, not in the
co
n
structor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Helper function to
c
h
eck the existan
c
e of a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Ha
u
sman
n
Ad
d
ed
some helper f
u
nction(s)
to parse
t
he depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed the de
f
ault
b
ran
c
h for impo
r
ts from "mast
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
C
h
anged the form
a
t
of the
i
m
ported log
mes
s
age
s
l
i
g
htl
y
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
R
emoved the
.
py extens
i
on from git-p4 as it's
a
n
n
oying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
a
n
n
Don't show the submit t
e
mplate
and t
h
e
d
iff f
i
rst in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Make it possible to invoke git
-
p4 from wit
h
in
s
ubdirect
o
ries
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Mad
e
--apply-a
s
-patch the de
f
ault for git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausm
a
nn
Fix suppo
r
t f
o
r deletions in g
i
t-p4 sub
m
it when us
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausma
n
n
Added exp
e
r
i
me
n
tal
b
ut super-fast --apply
-
as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Documentati
o
n enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausm
a
n
n
Start of the
g
i
t
-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n H
a
u
smann
Removed p4-fast-export a
n
d p4
-
g
it-sync as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
ausm
a
nn
Fi
x
ed the initial vers
i
on i
m
port
by
g
etting
t
h
e
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
au
s
mann
Added missing
"self"s to m
a
ke
the script
evalua
t
e
c
orrectl
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usmann
Completel
y
unte
s
te
d
"m
e
r
g
e" o
f
p4-
f
ast-export
.
p
y
i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-to
-
perforce i
s
now called
subm
i
t an
d
f
ixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausmann
Part of the co
d
e is c
o
py
r
i
g
ht by T
r
o
l
ltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
on Hausmann
Firs
t
(untested) atte
m
p
t at migr
a
ting p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Haus
m
a
n
n
Provide a little bit of help
description for th
e
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start moving the git-p4
t
o
ol
s
into one singl
e
s
cri
p
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hau
s
mann
Pass the right number of argumen
t
s to commit, fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Improved
t
he git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon
Hausmann
Defau
l
t
t
o in
t
eract
i
v
e
syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Haus
m
a
nn
Use p4 revert
.
.
.
instead
of revert -a
.
.
.
a
f
ter su
b
mitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
A
uto-detect
the
c
u
r
r
e
n
t git
branch
b
efore sub
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Ignore Apple resource file
s
when
importing from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausm
a
nn
B
e
nice and u
s
e /usr/b
i
n
/
env python for th
e
git
-
p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
au
s
mann
Auto
m
aticall
y
operate on a temporary b
r
anch
,
needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mo
n
Hausmann
Lo
t
s of b
u
g
fixes to p4
-
git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
o
n Hausmann
Fix git-dir option and
a
llow readin
g
log substit
u
tions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Ha
u
smann
First version of a new script to submit chan
g
es
b
ack
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
u
smann
Spl
i
t up the
c
a
ch
e
c
o
m
m
andl
i
ne op
t
ions in
t
o
(
c
ommand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce
t
h
e number of fa
l
s
e
"
m
erges"
by s
k
ipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n Hausmann
Mor
e
work o
n
b
ranch detect
i
on b
y
imple
m
enting
c
hangeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
ore code
c
leanups and preparations for mor
e
bra
n
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code
c
leanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausm
a
nn
Make the
p
4 dat
a
/command cache configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed p4-debug f
i
le ex
t
ensi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon H
a
usma
n
n
Changed
-
-known-branches to
t
ake a f
i
le as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon
H
a
u
sm
a
nn
Wo
r
k in progr
e
ss on
detecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust
the output
p
a
r
s
i
ng
of git n
a
me-rev to hand
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Do
n
't print a plain newlin
e
a
t
the end of the ex
e
cution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on Haus
m
ann
Mor
e
work in --silent
s
upport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausmann
Add
e
d supp
o
rt for
-
-si
l
ent so t
h
at p4-fast-export
can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hausmann
Added
p4 del
e
te behavi
o
ur
a
l emu
l
ation as todo it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hau
s
man
n
Fix single-branch imports by skipping
t
he branch/me
r
ge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
on H
a
usm
a
nn
Use se
t
s
.
Set(
)
instead of s
e
t
(
)
to run also w
i
th o
l
der
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Make
i
t
pos
s
i
ble
t
o
specify the
p
4
changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
When tryin
g
to map p4 integrations
to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
sma
n
n
Set g
i
t fa
s
t-imp
o
rt marks for every
i
mported c
h
ange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
Af
t
er m
a
r
k
ing a p4 branch
as m
e
r
g
e
d don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
More fixe
s
in he
u
ri
s
tic p
4
branch det
e
ction ba
s
ed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon
H
ausmann
Sta
r
ted work on p4 br
a
nch detecti
o
n (ex
p
e
rimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usman
n
Co
d
e clean
u
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next